From 01a7b20655602f7e2df59af744b47b77f678b6cf Mon Sep 17 00:00:00 2001 From: Greg Brail Date: Sun, 16 Jun 2024 11:39:32 -0700 Subject: [PATCH] Rename the main module and all-in-one JAR The main module is now named "rhino", and exports the "org.mozilla.rhino" package. The "rhino-all" module builds the "rhino-all.jar", which contains all the modules except the ScriptEngine (like the old "rhino.jar") and is sufficient to run Rhino using "java -jar". --- README.md | 6 ++-- benchmarks/build.gradle | 2 +- examples/build.gradle | 2 +- gradle.properties | 2 -- {rhino-runtime => rhino-all}/build.gradle | 30 +++++++++++++++++-- rhino-engine/build.gradle | 2 +- rhino-engine/src/main/java/module-info.java | 2 +- rhino-tools/build.gradle | 2 +- rhino-tools/src/main/java/module-info.java | 2 +- rhino-xml/build.gradle | 2 +- rhino-xml/src/main/java/module-info.java | 2 +- rhino/build.gradle | 28 ++--------------- .../src/main/java/module-info.java | 2 +- .../java/org/mozilla/classfile/ByteCode.java | 0 .../org/mozilla/classfile/ClassFileField.java | 0 .../mozilla/classfile/ClassFileMethod.java | 0 .../mozilla/classfile/ClassFileWriter.java | 0 .../org/mozilla/classfile/ConstantEntry.java | 0 .../org/mozilla/classfile/ConstantPool.java | 0 .../classfile/ExceptionTableEntry.java | 0 .../mozilla/classfile/FieldOrMethodRef.java | 0 .../org/mozilla/classfile/SuperBlock.java | 0 .../java/org/mozilla/classfile/TypeInfo.java | 0 .../AbstractEcmaObjectOperations.java | 0 .../org/mozilla/javascript/AccessorSlot.java | 0 .../org/mozilla/javascript/Arguments.java | 0 .../org/mozilla/javascript/ArrowFunction.java | 0 .../org/mozilla/javascript/BaseFunction.java | 0 .../org/mozilla/javascript/BoundFunction.java | 0 .../java/org/mozilla/javascript/Callable.java | 0 .../org/mozilla/javascript/ClassCache.java | 0 .../org/mozilla/javascript/ClassShutter.java | 0 .../org/mozilla/javascript/CodeGenerator.java | 0 .../mozilla/javascript/CompilerEnvirons.java | 0 .../org/mozilla/javascript/ConsString.java | 0 .../mozilla/javascript/ConstProperties.java | 0 .../org/mozilla/javascript/Constructable.java | 0 .../java/org/mozilla/javascript/Context.java | 0 .../org/mozilla/javascript/ContextAction.java | 0 .../mozilla/javascript/ContextFactory.java | 0 .../mozilla/javascript/ContextListener.java | 0 .../javascript/ContinuationPending.java | 0 .../java/org/mozilla/javascript/DToA.java | 0 .../org/mozilla/javascript/Decompiler.java | 0 .../javascript/DefaultErrorReporter.java | 0 .../javascript/DefiningClassLoader.java | 0 .../org/mozilla/javascript/Delegator.java | 0 .../org/mozilla/javascript/ES6Generator.java | 0 .../org/mozilla/javascript/ES6Iterator.java | 0 .../org/mozilla/javascript/EcmaError.java | 0 .../mozilla/javascript/EmbeddedSlotMap.java | 0 .../mozilla/javascript/EqualObjectGraphs.java | 0 .../org/mozilla/javascript/ErrorReporter.java | 0 .../org/mozilla/javascript/Evaluator.java | 0 .../javascript/EvaluatorException.java | 0 .../mozilla/javascript/ExternalArrayData.java | 0 .../java/org/mozilla/javascript/Function.java | 0 .../mozilla/javascript/FunctionObject.java | 0 .../javascript/GeneratedClassLoader.java | 0 .../org/mozilla/javascript/HashSlotMap.java | 0 .../org/mozilla/javascript/Hashtable.java | 0 .../org/mozilla/javascript/IRFactory.java | 0 .../java/org/mozilla/javascript/Icode.java | 0 .../mozilla/javascript/IdFunctionCall.java | 0 .../mozilla/javascript/IdFunctionObject.java | 0 .../javascript/IdFunctionObjectES6.java | 0 .../javascript/IdScriptableObject.java | 0 .../javascript/ImplementationVersion.java | 0 .../mozilla/javascript/ImporterTopLevel.java | 0 .../mozilla/javascript/InterfaceAdapter.java | 0 .../javascript/InterpretedFunction.java | 0 .../org/mozilla/javascript/Interpreter.java | 0 .../mozilla/javascript/InterpreterData.java | 0 .../javascript/IteratorLikeIterable.java | 0 .../org/mozilla/javascript/JavaAdapter.java | 0 .../org/mozilla/javascript/JavaMembers.java | 0 .../mozilla/javascript/JavaMembers_jdk11.java | 0 .../javascript/JavaScriptException.java | 0 .../javascript/JavaToJSONConverters.java | 0 .../main/java/org/mozilla/javascript/Kit.java | 0 .../mozilla/javascript/LambdaConstructor.java | 0 .../mozilla/javascript/LambdaFunction.java | 0 .../org/mozilla/javascript/LambdaSlot.java | 0 .../mozilla/javascript/LazilyLoadedCtor.java | 0 .../org/mozilla/javascript/LazyLoadSlot.java | 0 .../org/mozilla/javascript/MemberBox.java | 0 .../org/mozilla/javascript/NativeArray.java | 0 .../javascript/NativeArrayIterator.java | 0 .../org/mozilla/javascript/NativeBigInt.java | 0 .../org/mozilla/javascript/NativeBoolean.java | 0 .../org/mozilla/javascript/NativeCall.java | 0 .../mozilla/javascript/NativeCallSite.java | 0 .../javascript/NativeCollectionIterator.java | 0 .../org/mozilla/javascript/NativeConsole.java | 0 .../javascript/NativeContinuation.java | 0 .../org/mozilla/javascript/NativeDate.java | 0 .../org/mozilla/javascript/NativeError.java | 0 .../mozilla/javascript/NativeFunction.java | 0 .../mozilla/javascript/NativeGenerator.java | 0 .../org/mozilla/javascript/NativeGlobal.java | 0 .../mozilla/javascript/NativeIterator.java | 0 .../org/mozilla/javascript/NativeJSON.java | 0 .../mozilla/javascript/NativeJavaArray.java | 0 .../mozilla/javascript/NativeJavaClass.java | 0 .../javascript/NativeJavaConstructor.java | 0 .../mozilla/javascript/NativeJavaList.java | 0 .../org/mozilla/javascript/NativeJavaMap.java | 0 .../mozilla/javascript/NativeJavaMethod.java | 0 .../mozilla/javascript/NativeJavaObject.java | 0 .../mozilla/javascript/NativeJavaPackage.java | 0 .../javascript/NativeJavaTopPackage.java | 0 .../org/mozilla/javascript/NativeMap.java | 0 .../org/mozilla/javascript/NativeMath.java | 0 .../org/mozilla/javascript/NativeNumber.java | 0 .../org/mozilla/javascript/NativeObject.java | 0 .../org/mozilla/javascript/NativePromise.java | 0 .../org/mozilla/javascript/NativeScript.java | 0 .../org/mozilla/javascript/NativeSet.java | 0 .../org/mozilla/javascript/NativeString.java | 0 .../javascript/NativeStringIterator.java | 0 .../org/mozilla/javascript/NativeSymbol.java | 0 .../org/mozilla/javascript/NativeWeakMap.java | 0 .../org/mozilla/javascript/NativeWeakSet.java | 0 .../org/mozilla/javascript/NativeWith.java | 0 .../java/org/mozilla/javascript/Node.java | 0 .../mozilla/javascript/NodeTransformer.java | 0 .../java/org/mozilla/javascript/ObjArray.java | 0 .../org/mozilla/javascript/ObjToIntMap.java | 0 .../java/org/mozilla/javascript/Parser.java | 0 .../javascript/PolicySecurityController.java | 0 .../main/java/org/mozilla/javascript/Ref.java | 0 .../org/mozilla/javascript/RefCallable.java | 0 .../org/mozilla/javascript/RegExpProxy.java | 0 .../mozilla/javascript/RhinoException.java | 0 .../javascript/RhinoSecurityManager.java | 0 .../java/org/mozilla/javascript/Script.java | 0 .../org/mozilla/javascript/ScriptRuntime.java | 0 .../mozilla/javascript/ScriptRuntimeES6.java | 0 .../javascript/ScriptStackElement.java | 0 .../org/mozilla/javascript/Scriptable.java | 0 .../mozilla/javascript/ScriptableObject.java | 0 .../org/mozilla/javascript/SecureCaller.java | 0 .../javascript/SecurityController.java | 0 .../mozilla/javascript/SecurityUtilities.java | 0 .../java/org/mozilla/javascript/Slot.java | 0 .../java/org/mozilla/javascript/SlotMap.java | 0 .../mozilla/javascript/SlotMapContainer.java | 0 .../java/org/mozilla/javascript/Sorting.java | 0 .../org/mozilla/javascript/SpecialRef.java | 0 .../org/mozilla/javascript/StackStyle.java | 0 .../java/org/mozilla/javascript/Symbol.java | 0 .../org/mozilla/javascript/SymbolKey.java | 0 .../mozilla/javascript/SymbolScriptable.java | 0 .../org/mozilla/javascript/Synchronizer.java | 0 .../ThreadSafeSlotMapContainer.java | 0 .../java/org/mozilla/javascript/Token.java | 0 .../org/mozilla/javascript/TokenStream.java | 0 .../java/org/mozilla/javascript/TopLevel.java | 0 .../java/org/mozilla/javascript/UintMap.java | 0 .../org/mozilla/javascript/Undefined.java | 0 .../javascript/UnhandledRejectionTracker.java | 0 .../org/mozilla/javascript/UniqueTag.java | 0 .../java/org/mozilla/javascript/VMBridge.java | 0 .../org/mozilla/javascript/WrapFactory.java | 0 .../mozilla/javascript/WrappedException.java | 0 .../java/org/mozilla/javascript/Wrapper.java | 0 .../javascript/annotations/JSConstructor.java | 0 .../javascript/annotations/JSFunction.java | 0 .../javascript/annotations/JSGetter.java | 0 .../javascript/annotations/JSSetter.java | 0 .../annotations/JSStaticFunction.java | 0 .../javascript/ast/ArrayComprehension.java | 0 .../ast/ArrayComprehensionLoop.java | 0 .../mozilla/javascript/ast/ArrayLiteral.java | 0 .../mozilla/javascript/ast/Assignment.java | 0 .../org/mozilla/javascript/ast/AstNode.java | 0 .../org/mozilla/javascript/ast/AstRoot.java | 0 .../mozilla/javascript/ast/BigIntLiteral.java | 0 .../org/mozilla/javascript/ast/Block.java | 0 .../javascript/ast/BreakStatement.java | 0 .../mozilla/javascript/ast/CatchClause.java | 0 .../org/mozilla/javascript/ast/Comment.java | 0 .../javascript/ast/ConditionalExpression.java | 0 .../javascript/ast/ContinueStatement.java | 0 .../javascript/ast/DestructuringForm.java | 0 .../org/mozilla/javascript/ast/DoLoop.java | 0 .../mozilla/javascript/ast/ElementGet.java | 0 .../javascript/ast/EmptyExpression.java | 0 .../javascript/ast/EmptyStatement.java | 0 .../javascript/ast/ErrorCollector.java | 0 .../org/mozilla/javascript/ast/ErrorNode.java | 0 .../javascript/ast/ExpressionStatement.java | 0 .../org/mozilla/javascript/ast/ForInLoop.java | 0 .../org/mozilla/javascript/ast/ForLoop.java | 0 .../mozilla/javascript/ast/FunctionCall.java | 0 .../mozilla/javascript/ast/FunctionNode.java | 0 .../javascript/ast/GeneratorExpression.java | 0 .../ast/GeneratorExpressionLoop.java | 0 .../javascript/ast/IdeErrorReporter.java | 0 .../mozilla/javascript/ast/IfStatement.java | 0 .../javascript/ast/InfixExpression.java | 0 .../java/org/mozilla/javascript/ast/Jump.java | 0 .../javascript/ast/KeywordLiteral.java | 0 .../org/mozilla/javascript/ast/Label.java | 0 .../javascript/ast/LabeledStatement.java | 0 .../org/mozilla/javascript/ast/LetNode.java | 0 .../java/org/mozilla/javascript/ast/Loop.java | 0 .../java/org/mozilla/javascript/ast/Name.java | 0 .../mozilla/javascript/ast/NewExpression.java | 0 .../mozilla/javascript/ast/NodeVisitor.java | 0 .../mozilla/javascript/ast/NumberLiteral.java | 0 .../mozilla/javascript/ast/ObjectLiteral.java | 0 .../javascript/ast/ObjectProperty.java | 0 .../ast/ParenthesizedExpression.java | 0 .../mozilla/javascript/ast/ParseProblem.java | 0 .../mozilla/javascript/ast/PropertyGet.java | 0 .../mozilla/javascript/ast/RegExpLiteral.java | 0 .../javascript/ast/ReturnStatement.java | 0 .../org/mozilla/javascript/ast/Scope.java | 0 .../mozilla/javascript/ast/ScriptNode.java | 0 .../mozilla/javascript/ast/StringLiteral.java | 0 .../mozilla/javascript/ast/SwitchCase.java | 0 .../javascript/ast/SwitchStatement.java | 0 .../org/mozilla/javascript/ast/Symbol.java | 0 .../javascript/ast/TaggedTemplateLiteral.java | 0 .../javascript/ast/TemplateCharacters.java | 0 .../javascript/ast/TemplateLiteral.java | 0 .../javascript/ast/ThrowStatement.java | 0 .../mozilla/javascript/ast/TryStatement.java | 0 .../javascript/ast/UnaryExpression.java | 0 .../javascript/ast/UpdateExpression.java | 0 .../javascript/ast/VariableDeclaration.java | 0 .../javascript/ast/VariableInitializer.java | 0 .../org/mozilla/javascript/ast/WhileLoop.java | 0 .../mozilla/javascript/ast/WithStatement.java | 0 .../mozilla/javascript/ast/XmlDotQuery.java | 0 .../mozilla/javascript/ast/XmlElemRef.java | 0 .../mozilla/javascript/ast/XmlExpression.java | 0 .../mozilla/javascript/ast/XmlFragment.java | 0 .../mozilla/javascript/ast/XmlLiteral.java | 0 .../mozilla/javascript/ast/XmlMemberGet.java | 0 .../mozilla/javascript/ast/XmlPropRef.java | 0 .../org/mozilla/javascript/ast/XmlRef.java | 0 .../org/mozilla/javascript/ast/XmlString.java | 0 .../org/mozilla/javascript/ast/Yield.java | 0 .../commonjs/module/ModuleScope.java | 0 .../commonjs/module/ModuleScript.java | 0 .../commonjs/module/ModuleScriptProvider.java | 0 .../javascript/commonjs/module/Require.java | 0 .../commonjs/module/RequireBuilder.java | 0 .../javascript/commonjs/module/package.html | 0 .../CachingModuleScriptProviderBase.java | 0 .../DefaultUrlConnectionExpiryCalculator.java | 0 .../module/provider/ModuleSource.java | 0 .../module/provider/ModuleSourceProvider.java | 0 .../provider/ModuleSourceProviderBase.java | 0 .../provider/MultiModuleScriptProvider.java | 0 .../module/provider/ParsedContentType.java | 0 .../SoftCachingModuleScriptProvider.java | 0 .../StrongCachingModuleScriptProvider.java | 0 .../UrlConnectionExpiryCalculator.java | 0 .../UrlConnectionSecurityDomainProvider.java | 0 .../provider/UrlModuleSourceProvider.java | 0 .../commonjs/module/provider/package.html | 0 .../mozilla/javascript/debug/DebugFrame.java | 0 .../javascript/debug/DebuggableObject.java | 0 .../javascript/debug/DebuggableScript.java | 0 .../mozilla/javascript/debug/Debugger.java | 0 .../javascript/jdk18/VMBridge_jdk18.java | 0 .../mozilla/javascript/json/JsonParser.java | 0 .../mozilla/javascript/optimizer/Block.java | 0 .../javascript/optimizer/BodyCodegen.java | 0 .../javascript/optimizer/ClassCompiler.java | 0 .../mozilla/javascript/optimizer/Codegen.java | 0 .../javascript/optimizer/OptFunctionNode.java | 0 .../javascript/optimizer/OptRuntime.java | 0 .../javascript/optimizer/OptTransformer.java | 0 .../javascript/optimizer/Optimizer.java | 0 .../javascript/regexp/NativeRegExp.java | 0 .../regexp/NativeRegExpCallable.java | 0 .../javascript/regexp/NativeRegExpCtor.java | 0 .../regexp/NativeRegExpInstantiator.java | 0 .../mozilla/javascript/regexp/RegExpImpl.java | 0 .../mozilla/javascript/regexp/SubString.java | 0 .../serialize/ScriptableInputStream.java | 0 .../serialize/ScriptableOutputStream.java | 0 .../javascript/typedarrays/ByteIo.java | 0 .../javascript/typedarrays/Conversions.java | 0 .../typedarrays/NativeArrayBuffer.java | 0 .../typedarrays/NativeArrayBufferView.java | 0 .../typedarrays/NativeDataView.java | 0 .../typedarrays/NativeFloat32Array.java | 0 .../typedarrays/NativeFloat64Array.java | 0 .../typedarrays/NativeInt16Array.java | 0 .../typedarrays/NativeInt32Array.java | 0 .../typedarrays/NativeInt8Array.java | 0 .../typedarrays/NativeTypedArrayIterator.java | 0 .../typedarrays/NativeTypedArrayView.java | 0 .../typedarrays/NativeUint16Array.java | 0 .../typedarrays/NativeUint32Array.java | 0 .../typedarrays/NativeUint8Array.java | 0 .../typedarrays/NativeUint8ClampedArray.java | 0 .../javascript/v8dtoa/CachedPowers.java | 0 .../org/mozilla/javascript/v8dtoa/DiyFp.java | 0 .../javascript/v8dtoa/DoubleConversion.java | 0 .../javascript/v8dtoa/DoubleHelper.java | 0 .../mozilla/javascript/v8dtoa/FastDtoa.java | 0 .../javascript/v8dtoa/FastDtoaBuilder.java | 0 .../org/mozilla/javascript/xml/XMLLib.java | 0 .../org/mozilla/javascript/xml/XMLObject.java | 0 .../javascript/resources/Messages.properties | 0 .../resources/Messages_en.properties | 0 .../resources/Messages_fr.properties | 0 .../javascript/EqualObjectGraphsTest.java | 0 .../org/mozilla/javascript/SlotMapTest.java | 0 .../ThreadSafeScriptableObjectTest.java | 0 .../tests/ApplyOnPrimitiveNumberTest.java | 0 .../tests/ArrowFnPositionBugTest.java | 0 .../tests/AvoidObjectDetectionTest.java | 0 .../mozilla/javascript/tests/BigIntTest.java | 0 .../javascript/tests/Bug409702Test.java | 0 .../javascript/tests/Bug412433Test.java | 0 .../javascript/tests/Bug419940Test.java | 0 .../javascript/tests/Bug421071Test.java | 0 .../javascript/tests/Bug448816Test.java | 0 .../javascript/tests/Bug466207Test.java | 0 .../javascript/tests/Bug467396Test.java | 0 .../javascript/tests/Bug482203Test.java | 0 .../javascript/tests/Bug491621Test.java | 0 .../javascript/tests/Bug492525Test.java | 0 .../javascript/tests/Bug496585Test.java | 0 .../javascript/tests/Bug637811Test.java | 0 .../javascript/tests/Bug685403Test.java | 0 .../javascript/tests/Bug687669Test.java | 0 .../javascript/tests/Bug688018Test.java | 0 .../javascript/tests/Bug688021Test.java | 0 .../javascript/tests/Bug688023Test.java | 0 .../javascript/tests/Bug689308Test.java | 0 .../javascript/tests/Bug689314Test.java | 0 .../javascript/tests/Bug708801Test.java | 0 .../javascript/tests/Bug714204Test.java | 0 .../javascript/tests/Bug782363Test.java | 0 .../javascript/tests/Bug783797Test.java | 0 .../javascript/tests/Bug789277Test.java | 0 .../javascript/tests/BugGetterSetterTest.java | 0 .../tests/BugXmlMemberGetToSource.java | 0 .../mozilla/javascript/tests/CatchTest.java | 0 .../tests/ClassShutterExceptionTest.java | 0 .../mozilla/javascript/tests/CodegenTest.java | 0 .../javascript/tests/ConsStringTest.java | 0 .../javascript/tests/ContextFactoryTest.java | 0 .../tests/ContinuationsApiTest.java | 0 .../CustomSetterAcceptNullScriptableTest.java | 0 .../javascript/tests/DecompileTest.java | 0 .../tests/DefineClassMapInheritance.java | 0 .../javascript/tests/DefineClassTest.java | 0 .../tests/DefineFunctionPropertiesTest.java | 0 .../javascript/tests/DelegatorTest.java | 0 .../javascript/tests/DeletePropertyTest.java | 0 .../javascript/tests/DynamicScopeTest.java | 0 .../javascript/tests/ErrorHandlingTest.java | 0 .../javascript/tests/ErrorPropertiesTest.java | 0 .../javascript/tests/ForEachForOfTest.java | 0 .../javascript/tests/FunctionTest.java | 0 .../tests/GeneratedClassNameTest.java | 0 .../tests/GeneratedMethodNameTest.java | 0 .../javascript/tests/GlobalParseXTest.java | 0 .../mozilla/javascript/tests/IndexTest.java | 0 .../javascript/tests/InitializationTest.java | 0 .../tests/InterfaceAdapterTest.java | 0 .../javascript/tests/Issue1041Test.java | 0 .../javascript/tests/Issue1206Test.java | 0 .../javascript/tests/Issue129Test.java | 0 .../javascript/tests/Issue176Test.java | 0 .../javascript/tests/Issue385Test.java | 0 .../javascript/tests/Issue533Test.java | 0 .../javascript/tests/Issue808Test.java | 0 .../javascript/tests/IterableTest.java | 0 .../javascript/tests/JavaAdapterTest.java | 0 .../javascript/tests/JavaIterableTest.java | 0 .../org/mozilla/javascript/tests/KitTest.java | 0 .../javascript/tests/LookupSetterTest.java | 0 .../javascript/tests/MemberBoxCallTest.java | 0 .../tests/MessageProviderLanguageTest.java | 0 .../tests/NativeArrayBufferTest.java | 0 .../javascript/tests/NativeArrayTest.java | 0 .../tests/NativeJavaObjectTest.java | 0 .../javascript/tests/NativeJsonTest.java | 0 .../javascript/tests/NativeRegExpTest.java | 0 .../javascript/tests/NativeStringTest.java | 0 .../javascript/tests/OverloadTest.java | 0 .../PrimitiveTypeScopeResolutionTest.java | 0 .../mozilla/javascript/tests/SortingTest.java | 0 .../tests/ToNumberConversionsTest.java | 0 .../tests/ToNumberLegacyConversionsTest.java | 0 .../mozilla/javascript/tests/TypeOfTest.java | 0 .../org/mozilla/javascript/tests/Utils.java | 0 .../javascript/tests/WrapFactoryTest.java | 0 .../org/mozilla/javascript/tests/Bug482203.js | 0 .../org/mozilla/javascript/tests/Issue176.js | 0 settings.gradle | 2 +- tests/build.gradle | 7 ++++- 402 files changed, 48 insertions(+), 45 deletions(-) rename {rhino-runtime => rhino-all}/build.gradle (54%) rename {rhino-runtime => rhino}/src/main/java/module-info.java (94%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/classfile/ByteCode.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/classfile/ClassFileField.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/classfile/ClassFileMethod.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/classfile/ClassFileWriter.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/classfile/ConstantEntry.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/classfile/ConstantPool.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/classfile/ExceptionTableEntry.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/classfile/FieldOrMethodRef.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/classfile/SuperBlock.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/classfile/TypeInfo.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/AbstractEcmaObjectOperations.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/AccessorSlot.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Arguments.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ArrowFunction.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/BaseFunction.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/BoundFunction.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Callable.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ClassCache.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ClassShutter.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/CodeGenerator.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/CompilerEnvirons.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ConsString.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ConstProperties.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Constructable.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Context.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ContextAction.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ContextFactory.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ContextListener.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ContinuationPending.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/DToA.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Decompiler.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/DefaultErrorReporter.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/DefiningClassLoader.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Delegator.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ES6Generator.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ES6Iterator.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/EcmaError.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/EmbeddedSlotMap.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/EqualObjectGraphs.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ErrorReporter.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Evaluator.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/EvaluatorException.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ExternalArrayData.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Function.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/FunctionObject.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/GeneratedClassLoader.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/HashSlotMap.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Hashtable.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/IRFactory.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Icode.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/IdFunctionCall.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/IdFunctionObject.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/IdFunctionObjectES6.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/IdScriptableObject.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ImplementationVersion.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ImporterTopLevel.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/InterfaceAdapter.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/InterpretedFunction.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Interpreter.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/InterpreterData.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/IteratorLikeIterable.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/JavaAdapter.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/JavaMembers.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/JavaMembers_jdk11.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/JavaScriptException.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/JavaToJSONConverters.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Kit.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/LambdaConstructor.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/LambdaFunction.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/LambdaSlot.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/LazilyLoadedCtor.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/LazyLoadSlot.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/MemberBox.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeArray.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeArrayIterator.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeBigInt.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeBoolean.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeCall.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeCallSite.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeCollectionIterator.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeConsole.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeContinuation.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeDate.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeError.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeFunction.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeGenerator.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeGlobal.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeIterator.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeJSON.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeJavaArray.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeJavaClass.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeJavaConstructor.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeJavaList.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeJavaMap.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeJavaMethod.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeJavaObject.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeJavaPackage.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeJavaTopPackage.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeMap.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeMath.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeNumber.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeObject.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativePromise.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeScript.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeSet.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeString.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeStringIterator.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeSymbol.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeWeakMap.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeWeakSet.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NativeWith.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Node.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/NodeTransformer.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ObjArray.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ObjToIntMap.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Parser.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/PolicySecurityController.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Ref.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/RefCallable.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/RegExpProxy.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/RhinoException.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/RhinoSecurityManager.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Script.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ScriptRuntime.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ScriptRuntimeES6.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ScriptStackElement.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Scriptable.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ScriptableObject.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/SecureCaller.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/SecurityController.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/SecurityUtilities.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Slot.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/SlotMap.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/SlotMapContainer.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Sorting.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/SpecialRef.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/StackStyle.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Symbol.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/SymbolKey.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/SymbolScriptable.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Synchronizer.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ThreadSafeSlotMapContainer.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Token.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/TokenStream.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/TopLevel.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/UintMap.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Undefined.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/UnhandledRejectionTracker.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/UniqueTag.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/VMBridge.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/WrapFactory.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/WrappedException.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/Wrapper.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/annotations/JSConstructor.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/annotations/JSFunction.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/annotations/JSGetter.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/annotations/JSSetter.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/annotations/JSStaticFunction.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ArrayComprehension.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ArrayComprehensionLoop.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ArrayLiteral.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/Assignment.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/AstNode.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/AstRoot.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/BigIntLiteral.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/Block.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/BreakStatement.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/CatchClause.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/Comment.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ConditionalExpression.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ContinueStatement.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/DestructuringForm.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/DoLoop.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ElementGet.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/EmptyExpression.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/EmptyStatement.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ErrorCollector.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ErrorNode.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ExpressionStatement.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ForInLoop.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ForLoop.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/FunctionCall.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/FunctionNode.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/GeneratorExpression.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/GeneratorExpressionLoop.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/IdeErrorReporter.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/IfStatement.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/InfixExpression.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/Jump.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/KeywordLiteral.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/Label.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/LabeledStatement.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/LetNode.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/Loop.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/Name.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/NewExpression.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/NodeVisitor.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/NumberLiteral.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ObjectLiteral.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ObjectProperty.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ParenthesizedExpression.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ParseProblem.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/PropertyGet.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/RegExpLiteral.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ReturnStatement.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/Scope.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ScriptNode.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/StringLiteral.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/SwitchCase.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/SwitchStatement.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/Symbol.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/TaggedTemplateLiteral.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/TemplateCharacters.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/TemplateLiteral.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/ThrowStatement.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/TryStatement.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/UnaryExpression.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/UpdateExpression.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/VariableDeclaration.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/VariableInitializer.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/WhileLoop.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/WithStatement.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/XmlDotQuery.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/XmlElemRef.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/XmlExpression.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/XmlFragment.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/XmlLiteral.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/XmlMemberGet.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/XmlPropRef.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/XmlRef.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/XmlString.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/ast/Yield.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/ModuleScope.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/ModuleScript.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/ModuleScriptProvider.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/Require.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/RequireBuilder.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/package.html (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/provider/CachingModuleScriptProviderBase.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/provider/DefaultUrlConnectionExpiryCalculator.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/provider/ModuleSource.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/provider/ModuleSourceProvider.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/provider/ModuleSourceProviderBase.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/provider/MultiModuleScriptProvider.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/provider/ParsedContentType.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/provider/SoftCachingModuleScriptProvider.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/provider/StrongCachingModuleScriptProvider.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/provider/UrlConnectionExpiryCalculator.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/provider/UrlConnectionSecurityDomainProvider.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/provider/UrlModuleSourceProvider.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/commonjs/module/provider/package.html (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/debug/DebugFrame.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/debug/DebuggableObject.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/debug/DebuggableScript.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/debug/Debugger.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/jdk18/VMBridge_jdk18.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/json/JsonParser.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/optimizer/Block.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/optimizer/BodyCodegen.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/optimizer/ClassCompiler.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/optimizer/Codegen.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/optimizer/OptFunctionNode.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/optimizer/OptRuntime.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/optimizer/OptTransformer.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/optimizer/Optimizer.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/regexp/NativeRegExp.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/regexp/NativeRegExpCallable.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/regexp/NativeRegExpCtor.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/regexp/NativeRegExpInstantiator.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/regexp/RegExpImpl.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/regexp/SubString.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/serialize/ScriptableInputStream.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/serialize/ScriptableOutputStream.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/typedarrays/ByteIo.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/typedarrays/Conversions.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/typedarrays/NativeArrayBuffer.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/typedarrays/NativeArrayBufferView.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/typedarrays/NativeDataView.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/typedarrays/NativeFloat32Array.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/typedarrays/NativeFloat64Array.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/typedarrays/NativeInt16Array.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/typedarrays/NativeInt32Array.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/typedarrays/NativeInt8Array.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/typedarrays/NativeTypedArrayIterator.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/typedarrays/NativeTypedArrayView.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/typedarrays/NativeUint16Array.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/typedarrays/NativeUint32Array.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/typedarrays/NativeUint8Array.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/typedarrays/NativeUint8ClampedArray.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/v8dtoa/CachedPowers.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/v8dtoa/DiyFp.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/v8dtoa/DoubleConversion.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/v8dtoa/DoubleHelper.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/v8dtoa/FastDtoa.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/v8dtoa/FastDtoaBuilder.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/xml/XMLLib.java (100%) rename {rhino-runtime => rhino}/src/main/java/org/mozilla/javascript/xml/XMLObject.java (100%) rename {rhino-runtime => rhino}/src/main/resources/org/mozilla/javascript/resources/Messages.properties (100%) rename {rhino-runtime => rhino}/src/main/resources/org/mozilla/javascript/resources/Messages_en.properties (100%) rename {rhino-runtime => rhino}/src/main/resources/org/mozilla/javascript/resources/Messages_fr.properties (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/EqualObjectGraphsTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/SlotMapTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/ThreadSafeScriptableObjectTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/ApplyOnPrimitiveNumberTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/ArrowFnPositionBugTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/AvoidObjectDetectionTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/BigIntTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug409702Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug412433Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug419940Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug421071Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug448816Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug466207Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug467396Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug482203Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug491621Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug492525Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug496585Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug637811Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug685403Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug687669Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug688018Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug688021Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug688023Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug689308Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug689314Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug708801Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug714204Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug782363Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug783797Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Bug789277Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/BugGetterSetterTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/BugXmlMemberGetToSource.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/CatchTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/ClassShutterExceptionTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/CodegenTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/ConsStringTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/ContextFactoryTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/ContinuationsApiTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/CustomSetterAcceptNullScriptableTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/DecompileTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/DefineClassMapInheritance.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/DefineClassTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/DefineFunctionPropertiesTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/DelegatorTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/DeletePropertyTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/DynamicScopeTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/ErrorHandlingTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/ErrorPropertiesTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/ForEachForOfTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/FunctionTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/GeneratedClassNameTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/GeneratedMethodNameTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/GlobalParseXTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/IndexTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/InitializationTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/InterfaceAdapterTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Issue1041Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Issue1206Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Issue129Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Issue176Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Issue385Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Issue533Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Issue808Test.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/IterableTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/JavaAdapterTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/JavaIterableTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/KitTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/LookupSetterTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/MemberBoxCallTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/MessageProviderLanguageTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/NativeArrayBufferTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/NativeArrayTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/NativeJavaObjectTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/NativeJsonTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/NativeRegExpTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/NativeStringTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/OverloadTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/PrimitiveTypeScopeResolutionTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/SortingTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/ToNumberConversionsTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/ToNumberLegacyConversionsTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/TypeOfTest.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/Utils.java (100%) rename {rhino-runtime => rhino}/src/test/java/org/mozilla/javascript/tests/WrapFactoryTest.java (100%) rename {rhino-runtime => rhino}/src/test/resources/org/mozilla/javascript/tests/Bug482203.js (100%) rename {rhino-runtime => rhino}/src/test/resources/org/mozilla/javascript/tests/Issue176.js (100%) diff --git a/README.md b/README.md index 6aeab860bc..a1108232a5 100644 --- a/README.md +++ b/README.md @@ -52,15 +52,15 @@ Rhino 1.7.15 and before were primarily used in a single JAR called "rhino.jar". Newer releases now organize the code using Java modules. There are four primary modules: -* **rhino-runtime**: The primary codebase necessary and sufficient to run JavaScript code. Required by everything that uses Rhino. -* **rhino-tools**: Contains the shell, debugger, and the "Global" object, which many tests and other Rhino-based tools sometimes use. Note that adding Global gives Rhino the ability to print to stdout, open files, and do other things that may be considered dangerous in a shared environment. +* **rhino**: The primary codebase necessary and sufficient to run JavaScript code. Required by everything that uses Rhino. In releases *after* 1.7.15, this module does not contain the "tools" or the XML implementation. +* **rhino-tools**: Contains the shell, debugger, and the "Global" object, which many tests and other Rhino-based tools use. Note that adding Global gives Rhino the ability to print to stdout, open files, and do other things that may be considered dangerous in a sensitive environment, so it only makes sense to include if you will use it. * **rhino-xml**: Adds the implementation of the E4X XML standard. Only required if you are using that. * **rhino-engine**: Adds the Rhino implementation of the standard Java *ScriptEngine* interface. Some projects use this to be able to switch between script execution engines, but for anything even moderately complex it is almost always easier and always more flexible to use Rhino's API directly. The release contains the following other modules, which are used while building and testing but which are not published to Maven Central: -* **rhino**: This creates an "all-in-one" JAR that includes *rhino-runtime*, *rhino-tools*, and *rhino-xml*. This is what's used if you want to run Rhino using "java jar". +* **rhino-all**: This creates an "all-in-one" JAR that includes *rhino-runtime*, *rhino-tools*, and *rhino-xml*. This is what's used if you want to run Rhino using "java jar". * **tests**: The tests that depend on all of Rhino and also the external tests, including the Mozilla legacy test scripts and the test262 tests. * **benchmarks**: Runs benchmarks using JMH. * **examples**: Surprisingly, this contains example code. diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle index ca39c0f9b9..d87357bbd4 100644 --- a/benchmarks/build.gradle +++ b/benchmarks/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation project(':rhino-runtime') + implementation project(':rhino') implementation project(':rhino-tools') } diff --git a/examples/build.gradle b/examples/build.gradle index 3c32dba378..a5f1b09894 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation project(':rhino-runtime') + implementation project(':rhino') implementation project(':rhino-tools') implementation project(':rhino-xml') } diff --git a/gradle.properties b/gradle.properties index c18361b126..f1a0256cd9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,6 +4,4 @@ version=1.7.16-SNAPSHOT mavenSnapshotRepo=https://oss.sonatype.org/content/repositories/snapshots mavenReleaseRepo=https://oss.sonatype.org/service/local/staging/deploy/maven2/ org.gradle.caching=true -org.gradle.configuration-cache=true -org.gradle.configuration-cache.problems=warn org.gradle.parallel=true diff --git a/rhino-runtime/build.gradle b/rhino-all/build.gradle similarity index 54% rename from rhino-runtime/build.gradle rename to rhino-all/build.gradle index f4cba1e40c..07cef496ed 100644 --- a/rhino-runtime/build.gradle +++ b/rhino-all/build.gradle @@ -1,15 +1,39 @@ plugins { id 'rhino.library-conventions' + id 'com.github.johnrengelman.shadow' version '8.1.1' + id 'application' } +application { + mainClass = 'org.mozilla.javascript.tools.shell.Main' +} + +run { + standardInput = System.in +} + +dependencies { + implementation project(':rhino') + implementation project(':rhino-tools') + implementation project(':rhino-xml') +} + +shadowJar { + // Ensure that the "jar" from this step is the shadowed one that we want to + // publish in Maven. + archiveClassifier.set('') + manifest { + inheritFrom(project.tasks.jar.manifest) + } +} publishing { publications { - rhinoruntime(MavenPublication) { + rhinoall(MavenPublication) { from components.java - artifacts = [jar, sourceJar, javadocJar] + artifacts = [jar] pom { - description = "Rhino JavaScript runtime jar, excludes XML, tools ScriptEngine wrapper" + description = "Rhino JavaScript all-in-one JAR, not for use with modular Java projects" url = "https://mozilla.github.io/rhino/" licenses { license { diff --git a/rhino-engine/build.gradle b/rhino-engine/build.gradle index 97c4a3e369..52bc35c2ff 100644 --- a/rhino-engine/build.gradle +++ b/rhino-engine/build.gradle @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation project(':rhino-runtime') + implementation project(':rhino') } publishing { diff --git a/rhino-engine/src/main/java/module-info.java b/rhino-engine/src/main/java/module-info.java index b71f98592f..5708da4ecd 100644 --- a/rhino-engine/src/main/java/module-info.java +++ b/rhino-engine/src/main/java/module-info.java @@ -1,6 +1,6 @@ module org.mozilla.rhino.engine { exports org.mozilla.javascript.engine; - requires org.mozilla.rhino.runtime; + requires org.mozilla.rhino; requires java.scripting; } diff --git a/rhino-tools/build.gradle b/rhino-tools/build.gradle index 2a8eac380d..b94e0a7725 100644 --- a/rhino-tools/build.gradle +++ b/rhino-tools/build.gradle @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation project(':rhino-runtime') + implementation project(':rhino') } publishing { diff --git a/rhino-tools/src/main/java/module-info.java b/rhino-tools/src/main/java/module-info.java index 145da17484..0bad7559a9 100644 --- a/rhino-tools/src/main/java/module-info.java +++ b/rhino-tools/src/main/java/module-info.java @@ -1,5 +1,5 @@ module org.mozilla.rhino.tools { - requires org.mozilla.rhino.runtime; + requires org.mozilla.rhino; requires java.desktop; exports org.mozilla.javascript.tools.debugger; diff --git a/rhino-xml/build.gradle b/rhino-xml/build.gradle index 4ae214c63e..d3aafc92b1 100644 --- a/rhino-xml/build.gradle +++ b/rhino-xml/build.gradle @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation project(':rhino-runtime') + implementation project(':rhino') } publishing { diff --git a/rhino-xml/src/main/java/module-info.java b/rhino-xml/src/main/java/module-info.java index 3346cca036..999bd68d22 100644 --- a/rhino-xml/src/main/java/module-info.java +++ b/rhino-xml/src/main/java/module-info.java @@ -1,6 +1,6 @@ module org.mozilla.javascript.xml { exports org.mozilla.javascript.xmlimpl; - requires org.mozilla.rhino.runtime; + requires org.mozilla.rhino; requires java.xml; } diff --git a/rhino/build.gradle b/rhino/build.gradle index 550bb99a86..9cab2d4527 100644 --- a/rhino/build.gradle +++ b/rhino/build.gradle @@ -1,39 +1,15 @@ plugins { id 'rhino.library-conventions' - id 'com.github.johnrengelman.shadow' version '8.1.1' - id 'application' } -application { - mainClass = 'org.mozilla.javascript.tools.shell.Main' -} - -run { - standardInput = System.in -} - -dependencies { - implementation project(':rhino-runtime') - implementation project(':rhino-tools') - implementation project(':rhino-xml') -} - -shadowJar { - // Ensure that the "jar" from this step is the shadowed one that we want to - // publish in Maven. - archiveClassifier.set('') - manifest { - inheritFrom(project.tasks.jar.manifest) - } -} publishing { publications { rhino(MavenPublication) { from components.java - artifacts = [jar] + artifacts = [jar, sourceJar, javadocJar] pom { - description = "Rhino JavaScript all-in-one JAR, not for use with modular Java projects" + description = "Rhino JavaScript runtime jar, excludes XML, tools ScriptEngine wrapper" url = "https://mozilla.github.io/rhino/" licenses { license { diff --git a/rhino-runtime/src/main/java/module-info.java b/rhino/src/main/java/module-info.java similarity index 94% rename from rhino-runtime/src/main/java/module-info.java rename to rhino/src/main/java/module-info.java index 9fcd900e79..a1885a6ad8 100644 --- a/rhino-runtime/src/main/java/module-info.java +++ b/rhino/src/main/java/module-info.java @@ -1,4 +1,4 @@ -module org.mozilla.rhino.runtime { +module org.mozilla.rhino { exports org.mozilla.classfile; exports org.mozilla.javascript; exports org.mozilla.javascript.annotations; diff --git a/rhino-runtime/src/main/java/org/mozilla/classfile/ByteCode.java b/rhino/src/main/java/org/mozilla/classfile/ByteCode.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/classfile/ByteCode.java rename to rhino/src/main/java/org/mozilla/classfile/ByteCode.java diff --git a/rhino-runtime/src/main/java/org/mozilla/classfile/ClassFileField.java b/rhino/src/main/java/org/mozilla/classfile/ClassFileField.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/classfile/ClassFileField.java rename to rhino/src/main/java/org/mozilla/classfile/ClassFileField.java diff --git a/rhino-runtime/src/main/java/org/mozilla/classfile/ClassFileMethod.java b/rhino/src/main/java/org/mozilla/classfile/ClassFileMethod.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/classfile/ClassFileMethod.java rename to rhino/src/main/java/org/mozilla/classfile/ClassFileMethod.java diff --git a/rhino-runtime/src/main/java/org/mozilla/classfile/ClassFileWriter.java b/rhino/src/main/java/org/mozilla/classfile/ClassFileWriter.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/classfile/ClassFileWriter.java rename to rhino/src/main/java/org/mozilla/classfile/ClassFileWriter.java diff --git a/rhino-runtime/src/main/java/org/mozilla/classfile/ConstantEntry.java b/rhino/src/main/java/org/mozilla/classfile/ConstantEntry.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/classfile/ConstantEntry.java rename to rhino/src/main/java/org/mozilla/classfile/ConstantEntry.java diff --git a/rhino-runtime/src/main/java/org/mozilla/classfile/ConstantPool.java b/rhino/src/main/java/org/mozilla/classfile/ConstantPool.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/classfile/ConstantPool.java rename to rhino/src/main/java/org/mozilla/classfile/ConstantPool.java diff --git a/rhino-runtime/src/main/java/org/mozilla/classfile/ExceptionTableEntry.java b/rhino/src/main/java/org/mozilla/classfile/ExceptionTableEntry.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/classfile/ExceptionTableEntry.java rename to rhino/src/main/java/org/mozilla/classfile/ExceptionTableEntry.java diff --git a/rhino-runtime/src/main/java/org/mozilla/classfile/FieldOrMethodRef.java b/rhino/src/main/java/org/mozilla/classfile/FieldOrMethodRef.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/classfile/FieldOrMethodRef.java rename to rhino/src/main/java/org/mozilla/classfile/FieldOrMethodRef.java diff --git a/rhino-runtime/src/main/java/org/mozilla/classfile/SuperBlock.java b/rhino/src/main/java/org/mozilla/classfile/SuperBlock.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/classfile/SuperBlock.java rename to rhino/src/main/java/org/mozilla/classfile/SuperBlock.java diff --git a/rhino-runtime/src/main/java/org/mozilla/classfile/TypeInfo.java b/rhino/src/main/java/org/mozilla/classfile/TypeInfo.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/classfile/TypeInfo.java rename to rhino/src/main/java/org/mozilla/classfile/TypeInfo.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/AbstractEcmaObjectOperations.java b/rhino/src/main/java/org/mozilla/javascript/AbstractEcmaObjectOperations.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/AbstractEcmaObjectOperations.java rename to rhino/src/main/java/org/mozilla/javascript/AbstractEcmaObjectOperations.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/AccessorSlot.java b/rhino/src/main/java/org/mozilla/javascript/AccessorSlot.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/AccessorSlot.java rename to rhino/src/main/java/org/mozilla/javascript/AccessorSlot.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Arguments.java b/rhino/src/main/java/org/mozilla/javascript/Arguments.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Arguments.java rename to rhino/src/main/java/org/mozilla/javascript/Arguments.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ArrowFunction.java b/rhino/src/main/java/org/mozilla/javascript/ArrowFunction.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ArrowFunction.java rename to rhino/src/main/java/org/mozilla/javascript/ArrowFunction.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/BaseFunction.java b/rhino/src/main/java/org/mozilla/javascript/BaseFunction.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/BaseFunction.java rename to rhino/src/main/java/org/mozilla/javascript/BaseFunction.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/BoundFunction.java b/rhino/src/main/java/org/mozilla/javascript/BoundFunction.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/BoundFunction.java rename to rhino/src/main/java/org/mozilla/javascript/BoundFunction.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Callable.java b/rhino/src/main/java/org/mozilla/javascript/Callable.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Callable.java rename to rhino/src/main/java/org/mozilla/javascript/Callable.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ClassCache.java b/rhino/src/main/java/org/mozilla/javascript/ClassCache.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ClassCache.java rename to rhino/src/main/java/org/mozilla/javascript/ClassCache.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ClassShutter.java b/rhino/src/main/java/org/mozilla/javascript/ClassShutter.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ClassShutter.java rename to rhino/src/main/java/org/mozilla/javascript/ClassShutter.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/CodeGenerator.java b/rhino/src/main/java/org/mozilla/javascript/CodeGenerator.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/CodeGenerator.java rename to rhino/src/main/java/org/mozilla/javascript/CodeGenerator.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/CompilerEnvirons.java b/rhino/src/main/java/org/mozilla/javascript/CompilerEnvirons.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/CompilerEnvirons.java rename to rhino/src/main/java/org/mozilla/javascript/CompilerEnvirons.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ConsString.java b/rhino/src/main/java/org/mozilla/javascript/ConsString.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ConsString.java rename to rhino/src/main/java/org/mozilla/javascript/ConsString.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ConstProperties.java b/rhino/src/main/java/org/mozilla/javascript/ConstProperties.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ConstProperties.java rename to rhino/src/main/java/org/mozilla/javascript/ConstProperties.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Constructable.java b/rhino/src/main/java/org/mozilla/javascript/Constructable.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Constructable.java rename to rhino/src/main/java/org/mozilla/javascript/Constructable.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Context.java b/rhino/src/main/java/org/mozilla/javascript/Context.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Context.java rename to rhino/src/main/java/org/mozilla/javascript/Context.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ContextAction.java b/rhino/src/main/java/org/mozilla/javascript/ContextAction.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ContextAction.java rename to rhino/src/main/java/org/mozilla/javascript/ContextAction.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ContextFactory.java b/rhino/src/main/java/org/mozilla/javascript/ContextFactory.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ContextFactory.java rename to rhino/src/main/java/org/mozilla/javascript/ContextFactory.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ContextListener.java b/rhino/src/main/java/org/mozilla/javascript/ContextListener.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ContextListener.java rename to rhino/src/main/java/org/mozilla/javascript/ContextListener.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ContinuationPending.java b/rhino/src/main/java/org/mozilla/javascript/ContinuationPending.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ContinuationPending.java rename to rhino/src/main/java/org/mozilla/javascript/ContinuationPending.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/DToA.java b/rhino/src/main/java/org/mozilla/javascript/DToA.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/DToA.java rename to rhino/src/main/java/org/mozilla/javascript/DToA.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Decompiler.java b/rhino/src/main/java/org/mozilla/javascript/Decompiler.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Decompiler.java rename to rhino/src/main/java/org/mozilla/javascript/Decompiler.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/DefaultErrorReporter.java b/rhino/src/main/java/org/mozilla/javascript/DefaultErrorReporter.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/DefaultErrorReporter.java rename to rhino/src/main/java/org/mozilla/javascript/DefaultErrorReporter.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/DefiningClassLoader.java b/rhino/src/main/java/org/mozilla/javascript/DefiningClassLoader.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/DefiningClassLoader.java rename to rhino/src/main/java/org/mozilla/javascript/DefiningClassLoader.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Delegator.java b/rhino/src/main/java/org/mozilla/javascript/Delegator.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Delegator.java rename to rhino/src/main/java/org/mozilla/javascript/Delegator.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ES6Generator.java b/rhino/src/main/java/org/mozilla/javascript/ES6Generator.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ES6Generator.java rename to rhino/src/main/java/org/mozilla/javascript/ES6Generator.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ES6Iterator.java b/rhino/src/main/java/org/mozilla/javascript/ES6Iterator.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ES6Iterator.java rename to rhino/src/main/java/org/mozilla/javascript/ES6Iterator.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/EcmaError.java b/rhino/src/main/java/org/mozilla/javascript/EcmaError.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/EcmaError.java rename to rhino/src/main/java/org/mozilla/javascript/EcmaError.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/EmbeddedSlotMap.java b/rhino/src/main/java/org/mozilla/javascript/EmbeddedSlotMap.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/EmbeddedSlotMap.java rename to rhino/src/main/java/org/mozilla/javascript/EmbeddedSlotMap.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/EqualObjectGraphs.java b/rhino/src/main/java/org/mozilla/javascript/EqualObjectGraphs.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/EqualObjectGraphs.java rename to rhino/src/main/java/org/mozilla/javascript/EqualObjectGraphs.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ErrorReporter.java b/rhino/src/main/java/org/mozilla/javascript/ErrorReporter.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ErrorReporter.java rename to rhino/src/main/java/org/mozilla/javascript/ErrorReporter.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Evaluator.java b/rhino/src/main/java/org/mozilla/javascript/Evaluator.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Evaluator.java rename to rhino/src/main/java/org/mozilla/javascript/Evaluator.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/EvaluatorException.java b/rhino/src/main/java/org/mozilla/javascript/EvaluatorException.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/EvaluatorException.java rename to rhino/src/main/java/org/mozilla/javascript/EvaluatorException.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ExternalArrayData.java b/rhino/src/main/java/org/mozilla/javascript/ExternalArrayData.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ExternalArrayData.java rename to rhino/src/main/java/org/mozilla/javascript/ExternalArrayData.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Function.java b/rhino/src/main/java/org/mozilla/javascript/Function.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Function.java rename to rhino/src/main/java/org/mozilla/javascript/Function.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/FunctionObject.java b/rhino/src/main/java/org/mozilla/javascript/FunctionObject.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/FunctionObject.java rename to rhino/src/main/java/org/mozilla/javascript/FunctionObject.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/GeneratedClassLoader.java b/rhino/src/main/java/org/mozilla/javascript/GeneratedClassLoader.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/GeneratedClassLoader.java rename to rhino/src/main/java/org/mozilla/javascript/GeneratedClassLoader.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/HashSlotMap.java b/rhino/src/main/java/org/mozilla/javascript/HashSlotMap.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/HashSlotMap.java rename to rhino/src/main/java/org/mozilla/javascript/HashSlotMap.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Hashtable.java b/rhino/src/main/java/org/mozilla/javascript/Hashtable.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Hashtable.java rename to rhino/src/main/java/org/mozilla/javascript/Hashtable.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/IRFactory.java b/rhino/src/main/java/org/mozilla/javascript/IRFactory.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/IRFactory.java rename to rhino/src/main/java/org/mozilla/javascript/IRFactory.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Icode.java b/rhino/src/main/java/org/mozilla/javascript/Icode.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Icode.java rename to rhino/src/main/java/org/mozilla/javascript/Icode.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/IdFunctionCall.java b/rhino/src/main/java/org/mozilla/javascript/IdFunctionCall.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/IdFunctionCall.java rename to rhino/src/main/java/org/mozilla/javascript/IdFunctionCall.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/IdFunctionObject.java b/rhino/src/main/java/org/mozilla/javascript/IdFunctionObject.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/IdFunctionObject.java rename to rhino/src/main/java/org/mozilla/javascript/IdFunctionObject.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/IdFunctionObjectES6.java b/rhino/src/main/java/org/mozilla/javascript/IdFunctionObjectES6.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/IdFunctionObjectES6.java rename to rhino/src/main/java/org/mozilla/javascript/IdFunctionObjectES6.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/IdScriptableObject.java b/rhino/src/main/java/org/mozilla/javascript/IdScriptableObject.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/IdScriptableObject.java rename to rhino/src/main/java/org/mozilla/javascript/IdScriptableObject.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ImplementationVersion.java b/rhino/src/main/java/org/mozilla/javascript/ImplementationVersion.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ImplementationVersion.java rename to rhino/src/main/java/org/mozilla/javascript/ImplementationVersion.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ImporterTopLevel.java b/rhino/src/main/java/org/mozilla/javascript/ImporterTopLevel.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ImporterTopLevel.java rename to rhino/src/main/java/org/mozilla/javascript/ImporterTopLevel.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/InterfaceAdapter.java b/rhino/src/main/java/org/mozilla/javascript/InterfaceAdapter.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/InterfaceAdapter.java rename to rhino/src/main/java/org/mozilla/javascript/InterfaceAdapter.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/InterpretedFunction.java b/rhino/src/main/java/org/mozilla/javascript/InterpretedFunction.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/InterpretedFunction.java rename to rhino/src/main/java/org/mozilla/javascript/InterpretedFunction.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Interpreter.java b/rhino/src/main/java/org/mozilla/javascript/Interpreter.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Interpreter.java rename to rhino/src/main/java/org/mozilla/javascript/Interpreter.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/InterpreterData.java b/rhino/src/main/java/org/mozilla/javascript/InterpreterData.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/InterpreterData.java rename to rhino/src/main/java/org/mozilla/javascript/InterpreterData.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/IteratorLikeIterable.java b/rhino/src/main/java/org/mozilla/javascript/IteratorLikeIterable.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/IteratorLikeIterable.java rename to rhino/src/main/java/org/mozilla/javascript/IteratorLikeIterable.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/JavaAdapter.java b/rhino/src/main/java/org/mozilla/javascript/JavaAdapter.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/JavaAdapter.java rename to rhino/src/main/java/org/mozilla/javascript/JavaAdapter.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/JavaMembers.java b/rhino/src/main/java/org/mozilla/javascript/JavaMembers.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/JavaMembers.java rename to rhino/src/main/java/org/mozilla/javascript/JavaMembers.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/JavaMembers_jdk11.java b/rhino/src/main/java/org/mozilla/javascript/JavaMembers_jdk11.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/JavaMembers_jdk11.java rename to rhino/src/main/java/org/mozilla/javascript/JavaMembers_jdk11.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/JavaScriptException.java b/rhino/src/main/java/org/mozilla/javascript/JavaScriptException.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/JavaScriptException.java rename to rhino/src/main/java/org/mozilla/javascript/JavaScriptException.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/JavaToJSONConverters.java b/rhino/src/main/java/org/mozilla/javascript/JavaToJSONConverters.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/JavaToJSONConverters.java rename to rhino/src/main/java/org/mozilla/javascript/JavaToJSONConverters.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Kit.java b/rhino/src/main/java/org/mozilla/javascript/Kit.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Kit.java rename to rhino/src/main/java/org/mozilla/javascript/Kit.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/LambdaConstructor.java b/rhino/src/main/java/org/mozilla/javascript/LambdaConstructor.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/LambdaConstructor.java rename to rhino/src/main/java/org/mozilla/javascript/LambdaConstructor.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/LambdaFunction.java b/rhino/src/main/java/org/mozilla/javascript/LambdaFunction.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/LambdaFunction.java rename to rhino/src/main/java/org/mozilla/javascript/LambdaFunction.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/LambdaSlot.java b/rhino/src/main/java/org/mozilla/javascript/LambdaSlot.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/LambdaSlot.java rename to rhino/src/main/java/org/mozilla/javascript/LambdaSlot.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/LazilyLoadedCtor.java b/rhino/src/main/java/org/mozilla/javascript/LazilyLoadedCtor.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/LazilyLoadedCtor.java rename to rhino/src/main/java/org/mozilla/javascript/LazilyLoadedCtor.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/LazyLoadSlot.java b/rhino/src/main/java/org/mozilla/javascript/LazyLoadSlot.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/LazyLoadSlot.java rename to rhino/src/main/java/org/mozilla/javascript/LazyLoadSlot.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/MemberBox.java b/rhino/src/main/java/org/mozilla/javascript/MemberBox.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/MemberBox.java rename to rhino/src/main/java/org/mozilla/javascript/MemberBox.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeArray.java b/rhino/src/main/java/org/mozilla/javascript/NativeArray.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeArray.java rename to rhino/src/main/java/org/mozilla/javascript/NativeArray.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeArrayIterator.java b/rhino/src/main/java/org/mozilla/javascript/NativeArrayIterator.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeArrayIterator.java rename to rhino/src/main/java/org/mozilla/javascript/NativeArrayIterator.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeBigInt.java b/rhino/src/main/java/org/mozilla/javascript/NativeBigInt.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeBigInt.java rename to rhino/src/main/java/org/mozilla/javascript/NativeBigInt.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeBoolean.java b/rhino/src/main/java/org/mozilla/javascript/NativeBoolean.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeBoolean.java rename to rhino/src/main/java/org/mozilla/javascript/NativeBoolean.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeCall.java b/rhino/src/main/java/org/mozilla/javascript/NativeCall.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeCall.java rename to rhino/src/main/java/org/mozilla/javascript/NativeCall.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeCallSite.java b/rhino/src/main/java/org/mozilla/javascript/NativeCallSite.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeCallSite.java rename to rhino/src/main/java/org/mozilla/javascript/NativeCallSite.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeCollectionIterator.java b/rhino/src/main/java/org/mozilla/javascript/NativeCollectionIterator.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeCollectionIterator.java rename to rhino/src/main/java/org/mozilla/javascript/NativeCollectionIterator.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeConsole.java b/rhino/src/main/java/org/mozilla/javascript/NativeConsole.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeConsole.java rename to rhino/src/main/java/org/mozilla/javascript/NativeConsole.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeContinuation.java b/rhino/src/main/java/org/mozilla/javascript/NativeContinuation.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeContinuation.java rename to rhino/src/main/java/org/mozilla/javascript/NativeContinuation.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeDate.java b/rhino/src/main/java/org/mozilla/javascript/NativeDate.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeDate.java rename to rhino/src/main/java/org/mozilla/javascript/NativeDate.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeError.java b/rhino/src/main/java/org/mozilla/javascript/NativeError.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeError.java rename to rhino/src/main/java/org/mozilla/javascript/NativeError.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeFunction.java b/rhino/src/main/java/org/mozilla/javascript/NativeFunction.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeFunction.java rename to rhino/src/main/java/org/mozilla/javascript/NativeFunction.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeGenerator.java b/rhino/src/main/java/org/mozilla/javascript/NativeGenerator.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeGenerator.java rename to rhino/src/main/java/org/mozilla/javascript/NativeGenerator.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeGlobal.java b/rhino/src/main/java/org/mozilla/javascript/NativeGlobal.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeGlobal.java rename to rhino/src/main/java/org/mozilla/javascript/NativeGlobal.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeIterator.java b/rhino/src/main/java/org/mozilla/javascript/NativeIterator.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeIterator.java rename to rhino/src/main/java/org/mozilla/javascript/NativeIterator.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeJSON.java b/rhino/src/main/java/org/mozilla/javascript/NativeJSON.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeJSON.java rename to rhino/src/main/java/org/mozilla/javascript/NativeJSON.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaArray.java b/rhino/src/main/java/org/mozilla/javascript/NativeJavaArray.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaArray.java rename to rhino/src/main/java/org/mozilla/javascript/NativeJavaArray.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaClass.java b/rhino/src/main/java/org/mozilla/javascript/NativeJavaClass.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaClass.java rename to rhino/src/main/java/org/mozilla/javascript/NativeJavaClass.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaConstructor.java b/rhino/src/main/java/org/mozilla/javascript/NativeJavaConstructor.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaConstructor.java rename to rhino/src/main/java/org/mozilla/javascript/NativeJavaConstructor.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaList.java b/rhino/src/main/java/org/mozilla/javascript/NativeJavaList.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaList.java rename to rhino/src/main/java/org/mozilla/javascript/NativeJavaList.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaMap.java b/rhino/src/main/java/org/mozilla/javascript/NativeJavaMap.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaMap.java rename to rhino/src/main/java/org/mozilla/javascript/NativeJavaMap.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaMethod.java b/rhino/src/main/java/org/mozilla/javascript/NativeJavaMethod.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaMethod.java rename to rhino/src/main/java/org/mozilla/javascript/NativeJavaMethod.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaObject.java b/rhino/src/main/java/org/mozilla/javascript/NativeJavaObject.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaObject.java rename to rhino/src/main/java/org/mozilla/javascript/NativeJavaObject.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaPackage.java b/rhino/src/main/java/org/mozilla/javascript/NativeJavaPackage.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaPackage.java rename to rhino/src/main/java/org/mozilla/javascript/NativeJavaPackage.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaTopPackage.java b/rhino/src/main/java/org/mozilla/javascript/NativeJavaTopPackage.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeJavaTopPackage.java rename to rhino/src/main/java/org/mozilla/javascript/NativeJavaTopPackage.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeMap.java b/rhino/src/main/java/org/mozilla/javascript/NativeMap.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeMap.java rename to rhino/src/main/java/org/mozilla/javascript/NativeMap.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeMath.java b/rhino/src/main/java/org/mozilla/javascript/NativeMath.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeMath.java rename to rhino/src/main/java/org/mozilla/javascript/NativeMath.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeNumber.java b/rhino/src/main/java/org/mozilla/javascript/NativeNumber.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeNumber.java rename to rhino/src/main/java/org/mozilla/javascript/NativeNumber.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeObject.java b/rhino/src/main/java/org/mozilla/javascript/NativeObject.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeObject.java rename to rhino/src/main/java/org/mozilla/javascript/NativeObject.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativePromise.java b/rhino/src/main/java/org/mozilla/javascript/NativePromise.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativePromise.java rename to rhino/src/main/java/org/mozilla/javascript/NativePromise.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeScript.java b/rhino/src/main/java/org/mozilla/javascript/NativeScript.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeScript.java rename to rhino/src/main/java/org/mozilla/javascript/NativeScript.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeSet.java b/rhino/src/main/java/org/mozilla/javascript/NativeSet.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeSet.java rename to rhino/src/main/java/org/mozilla/javascript/NativeSet.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeString.java b/rhino/src/main/java/org/mozilla/javascript/NativeString.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeString.java rename to rhino/src/main/java/org/mozilla/javascript/NativeString.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeStringIterator.java b/rhino/src/main/java/org/mozilla/javascript/NativeStringIterator.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeStringIterator.java rename to rhino/src/main/java/org/mozilla/javascript/NativeStringIterator.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeSymbol.java b/rhino/src/main/java/org/mozilla/javascript/NativeSymbol.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeSymbol.java rename to rhino/src/main/java/org/mozilla/javascript/NativeSymbol.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeWeakMap.java b/rhino/src/main/java/org/mozilla/javascript/NativeWeakMap.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeWeakMap.java rename to rhino/src/main/java/org/mozilla/javascript/NativeWeakMap.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeWeakSet.java b/rhino/src/main/java/org/mozilla/javascript/NativeWeakSet.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeWeakSet.java rename to rhino/src/main/java/org/mozilla/javascript/NativeWeakSet.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NativeWith.java b/rhino/src/main/java/org/mozilla/javascript/NativeWith.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NativeWith.java rename to rhino/src/main/java/org/mozilla/javascript/NativeWith.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Node.java b/rhino/src/main/java/org/mozilla/javascript/Node.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Node.java rename to rhino/src/main/java/org/mozilla/javascript/Node.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/NodeTransformer.java b/rhino/src/main/java/org/mozilla/javascript/NodeTransformer.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/NodeTransformer.java rename to rhino/src/main/java/org/mozilla/javascript/NodeTransformer.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ObjArray.java b/rhino/src/main/java/org/mozilla/javascript/ObjArray.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ObjArray.java rename to rhino/src/main/java/org/mozilla/javascript/ObjArray.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ObjToIntMap.java b/rhino/src/main/java/org/mozilla/javascript/ObjToIntMap.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ObjToIntMap.java rename to rhino/src/main/java/org/mozilla/javascript/ObjToIntMap.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Parser.java b/rhino/src/main/java/org/mozilla/javascript/Parser.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Parser.java rename to rhino/src/main/java/org/mozilla/javascript/Parser.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/PolicySecurityController.java b/rhino/src/main/java/org/mozilla/javascript/PolicySecurityController.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/PolicySecurityController.java rename to rhino/src/main/java/org/mozilla/javascript/PolicySecurityController.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Ref.java b/rhino/src/main/java/org/mozilla/javascript/Ref.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Ref.java rename to rhino/src/main/java/org/mozilla/javascript/Ref.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/RefCallable.java b/rhino/src/main/java/org/mozilla/javascript/RefCallable.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/RefCallable.java rename to rhino/src/main/java/org/mozilla/javascript/RefCallable.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/RegExpProxy.java b/rhino/src/main/java/org/mozilla/javascript/RegExpProxy.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/RegExpProxy.java rename to rhino/src/main/java/org/mozilla/javascript/RegExpProxy.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/RhinoException.java b/rhino/src/main/java/org/mozilla/javascript/RhinoException.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/RhinoException.java rename to rhino/src/main/java/org/mozilla/javascript/RhinoException.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/RhinoSecurityManager.java b/rhino/src/main/java/org/mozilla/javascript/RhinoSecurityManager.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/RhinoSecurityManager.java rename to rhino/src/main/java/org/mozilla/javascript/RhinoSecurityManager.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Script.java b/rhino/src/main/java/org/mozilla/javascript/Script.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Script.java rename to rhino/src/main/java/org/mozilla/javascript/Script.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ScriptRuntime.java b/rhino/src/main/java/org/mozilla/javascript/ScriptRuntime.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ScriptRuntime.java rename to rhino/src/main/java/org/mozilla/javascript/ScriptRuntime.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ScriptRuntimeES6.java b/rhino/src/main/java/org/mozilla/javascript/ScriptRuntimeES6.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ScriptRuntimeES6.java rename to rhino/src/main/java/org/mozilla/javascript/ScriptRuntimeES6.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ScriptStackElement.java b/rhino/src/main/java/org/mozilla/javascript/ScriptStackElement.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ScriptStackElement.java rename to rhino/src/main/java/org/mozilla/javascript/ScriptStackElement.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Scriptable.java b/rhino/src/main/java/org/mozilla/javascript/Scriptable.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Scriptable.java rename to rhino/src/main/java/org/mozilla/javascript/Scriptable.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ScriptableObject.java b/rhino/src/main/java/org/mozilla/javascript/ScriptableObject.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ScriptableObject.java rename to rhino/src/main/java/org/mozilla/javascript/ScriptableObject.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/SecureCaller.java b/rhino/src/main/java/org/mozilla/javascript/SecureCaller.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/SecureCaller.java rename to rhino/src/main/java/org/mozilla/javascript/SecureCaller.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/SecurityController.java b/rhino/src/main/java/org/mozilla/javascript/SecurityController.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/SecurityController.java rename to rhino/src/main/java/org/mozilla/javascript/SecurityController.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/SecurityUtilities.java b/rhino/src/main/java/org/mozilla/javascript/SecurityUtilities.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/SecurityUtilities.java rename to rhino/src/main/java/org/mozilla/javascript/SecurityUtilities.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Slot.java b/rhino/src/main/java/org/mozilla/javascript/Slot.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Slot.java rename to rhino/src/main/java/org/mozilla/javascript/Slot.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/SlotMap.java b/rhino/src/main/java/org/mozilla/javascript/SlotMap.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/SlotMap.java rename to rhino/src/main/java/org/mozilla/javascript/SlotMap.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/SlotMapContainer.java b/rhino/src/main/java/org/mozilla/javascript/SlotMapContainer.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/SlotMapContainer.java rename to rhino/src/main/java/org/mozilla/javascript/SlotMapContainer.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Sorting.java b/rhino/src/main/java/org/mozilla/javascript/Sorting.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Sorting.java rename to rhino/src/main/java/org/mozilla/javascript/Sorting.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/SpecialRef.java b/rhino/src/main/java/org/mozilla/javascript/SpecialRef.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/SpecialRef.java rename to rhino/src/main/java/org/mozilla/javascript/SpecialRef.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/StackStyle.java b/rhino/src/main/java/org/mozilla/javascript/StackStyle.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/StackStyle.java rename to rhino/src/main/java/org/mozilla/javascript/StackStyle.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Symbol.java b/rhino/src/main/java/org/mozilla/javascript/Symbol.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Symbol.java rename to rhino/src/main/java/org/mozilla/javascript/Symbol.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/SymbolKey.java b/rhino/src/main/java/org/mozilla/javascript/SymbolKey.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/SymbolKey.java rename to rhino/src/main/java/org/mozilla/javascript/SymbolKey.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/SymbolScriptable.java b/rhino/src/main/java/org/mozilla/javascript/SymbolScriptable.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/SymbolScriptable.java rename to rhino/src/main/java/org/mozilla/javascript/SymbolScriptable.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Synchronizer.java b/rhino/src/main/java/org/mozilla/javascript/Synchronizer.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Synchronizer.java rename to rhino/src/main/java/org/mozilla/javascript/Synchronizer.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ThreadSafeSlotMapContainer.java b/rhino/src/main/java/org/mozilla/javascript/ThreadSafeSlotMapContainer.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ThreadSafeSlotMapContainer.java rename to rhino/src/main/java/org/mozilla/javascript/ThreadSafeSlotMapContainer.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Token.java b/rhino/src/main/java/org/mozilla/javascript/Token.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Token.java rename to rhino/src/main/java/org/mozilla/javascript/Token.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/TokenStream.java b/rhino/src/main/java/org/mozilla/javascript/TokenStream.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/TokenStream.java rename to rhino/src/main/java/org/mozilla/javascript/TokenStream.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/TopLevel.java b/rhino/src/main/java/org/mozilla/javascript/TopLevel.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/TopLevel.java rename to rhino/src/main/java/org/mozilla/javascript/TopLevel.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/UintMap.java b/rhino/src/main/java/org/mozilla/javascript/UintMap.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/UintMap.java rename to rhino/src/main/java/org/mozilla/javascript/UintMap.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Undefined.java b/rhino/src/main/java/org/mozilla/javascript/Undefined.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Undefined.java rename to rhino/src/main/java/org/mozilla/javascript/Undefined.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/UnhandledRejectionTracker.java b/rhino/src/main/java/org/mozilla/javascript/UnhandledRejectionTracker.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/UnhandledRejectionTracker.java rename to rhino/src/main/java/org/mozilla/javascript/UnhandledRejectionTracker.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/UniqueTag.java b/rhino/src/main/java/org/mozilla/javascript/UniqueTag.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/UniqueTag.java rename to rhino/src/main/java/org/mozilla/javascript/UniqueTag.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/VMBridge.java b/rhino/src/main/java/org/mozilla/javascript/VMBridge.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/VMBridge.java rename to rhino/src/main/java/org/mozilla/javascript/VMBridge.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/WrapFactory.java b/rhino/src/main/java/org/mozilla/javascript/WrapFactory.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/WrapFactory.java rename to rhino/src/main/java/org/mozilla/javascript/WrapFactory.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/WrappedException.java b/rhino/src/main/java/org/mozilla/javascript/WrappedException.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/WrappedException.java rename to rhino/src/main/java/org/mozilla/javascript/WrappedException.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/Wrapper.java b/rhino/src/main/java/org/mozilla/javascript/Wrapper.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/Wrapper.java rename to rhino/src/main/java/org/mozilla/javascript/Wrapper.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/annotations/JSConstructor.java b/rhino/src/main/java/org/mozilla/javascript/annotations/JSConstructor.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/annotations/JSConstructor.java rename to rhino/src/main/java/org/mozilla/javascript/annotations/JSConstructor.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/annotations/JSFunction.java b/rhino/src/main/java/org/mozilla/javascript/annotations/JSFunction.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/annotations/JSFunction.java rename to rhino/src/main/java/org/mozilla/javascript/annotations/JSFunction.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/annotations/JSGetter.java b/rhino/src/main/java/org/mozilla/javascript/annotations/JSGetter.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/annotations/JSGetter.java rename to rhino/src/main/java/org/mozilla/javascript/annotations/JSGetter.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/annotations/JSSetter.java b/rhino/src/main/java/org/mozilla/javascript/annotations/JSSetter.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/annotations/JSSetter.java rename to rhino/src/main/java/org/mozilla/javascript/annotations/JSSetter.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/annotations/JSStaticFunction.java b/rhino/src/main/java/org/mozilla/javascript/annotations/JSStaticFunction.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/annotations/JSStaticFunction.java rename to rhino/src/main/java/org/mozilla/javascript/annotations/JSStaticFunction.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ArrayComprehension.java b/rhino/src/main/java/org/mozilla/javascript/ast/ArrayComprehension.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ArrayComprehension.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ArrayComprehension.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ArrayComprehensionLoop.java b/rhino/src/main/java/org/mozilla/javascript/ast/ArrayComprehensionLoop.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ArrayComprehensionLoop.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ArrayComprehensionLoop.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ArrayLiteral.java b/rhino/src/main/java/org/mozilla/javascript/ast/ArrayLiteral.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ArrayLiteral.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ArrayLiteral.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/Assignment.java b/rhino/src/main/java/org/mozilla/javascript/ast/Assignment.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/Assignment.java rename to rhino/src/main/java/org/mozilla/javascript/ast/Assignment.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/AstNode.java b/rhino/src/main/java/org/mozilla/javascript/ast/AstNode.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/AstNode.java rename to rhino/src/main/java/org/mozilla/javascript/ast/AstNode.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/AstRoot.java b/rhino/src/main/java/org/mozilla/javascript/ast/AstRoot.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/AstRoot.java rename to rhino/src/main/java/org/mozilla/javascript/ast/AstRoot.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/BigIntLiteral.java b/rhino/src/main/java/org/mozilla/javascript/ast/BigIntLiteral.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/BigIntLiteral.java rename to rhino/src/main/java/org/mozilla/javascript/ast/BigIntLiteral.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/Block.java b/rhino/src/main/java/org/mozilla/javascript/ast/Block.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/Block.java rename to rhino/src/main/java/org/mozilla/javascript/ast/Block.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/BreakStatement.java b/rhino/src/main/java/org/mozilla/javascript/ast/BreakStatement.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/BreakStatement.java rename to rhino/src/main/java/org/mozilla/javascript/ast/BreakStatement.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/CatchClause.java b/rhino/src/main/java/org/mozilla/javascript/ast/CatchClause.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/CatchClause.java rename to rhino/src/main/java/org/mozilla/javascript/ast/CatchClause.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/Comment.java b/rhino/src/main/java/org/mozilla/javascript/ast/Comment.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/Comment.java rename to rhino/src/main/java/org/mozilla/javascript/ast/Comment.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ConditionalExpression.java b/rhino/src/main/java/org/mozilla/javascript/ast/ConditionalExpression.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ConditionalExpression.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ConditionalExpression.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ContinueStatement.java b/rhino/src/main/java/org/mozilla/javascript/ast/ContinueStatement.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ContinueStatement.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ContinueStatement.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/DestructuringForm.java b/rhino/src/main/java/org/mozilla/javascript/ast/DestructuringForm.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/DestructuringForm.java rename to rhino/src/main/java/org/mozilla/javascript/ast/DestructuringForm.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/DoLoop.java b/rhino/src/main/java/org/mozilla/javascript/ast/DoLoop.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/DoLoop.java rename to rhino/src/main/java/org/mozilla/javascript/ast/DoLoop.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ElementGet.java b/rhino/src/main/java/org/mozilla/javascript/ast/ElementGet.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ElementGet.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ElementGet.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/EmptyExpression.java b/rhino/src/main/java/org/mozilla/javascript/ast/EmptyExpression.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/EmptyExpression.java rename to rhino/src/main/java/org/mozilla/javascript/ast/EmptyExpression.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/EmptyStatement.java b/rhino/src/main/java/org/mozilla/javascript/ast/EmptyStatement.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/EmptyStatement.java rename to rhino/src/main/java/org/mozilla/javascript/ast/EmptyStatement.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ErrorCollector.java b/rhino/src/main/java/org/mozilla/javascript/ast/ErrorCollector.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ErrorCollector.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ErrorCollector.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ErrorNode.java b/rhino/src/main/java/org/mozilla/javascript/ast/ErrorNode.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ErrorNode.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ErrorNode.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ExpressionStatement.java b/rhino/src/main/java/org/mozilla/javascript/ast/ExpressionStatement.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ExpressionStatement.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ExpressionStatement.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ForInLoop.java b/rhino/src/main/java/org/mozilla/javascript/ast/ForInLoop.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ForInLoop.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ForInLoop.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ForLoop.java b/rhino/src/main/java/org/mozilla/javascript/ast/ForLoop.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ForLoop.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ForLoop.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/FunctionCall.java b/rhino/src/main/java/org/mozilla/javascript/ast/FunctionCall.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/FunctionCall.java rename to rhino/src/main/java/org/mozilla/javascript/ast/FunctionCall.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/FunctionNode.java b/rhino/src/main/java/org/mozilla/javascript/ast/FunctionNode.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/FunctionNode.java rename to rhino/src/main/java/org/mozilla/javascript/ast/FunctionNode.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/GeneratorExpression.java b/rhino/src/main/java/org/mozilla/javascript/ast/GeneratorExpression.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/GeneratorExpression.java rename to rhino/src/main/java/org/mozilla/javascript/ast/GeneratorExpression.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/GeneratorExpressionLoop.java b/rhino/src/main/java/org/mozilla/javascript/ast/GeneratorExpressionLoop.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/GeneratorExpressionLoop.java rename to rhino/src/main/java/org/mozilla/javascript/ast/GeneratorExpressionLoop.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/IdeErrorReporter.java b/rhino/src/main/java/org/mozilla/javascript/ast/IdeErrorReporter.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/IdeErrorReporter.java rename to rhino/src/main/java/org/mozilla/javascript/ast/IdeErrorReporter.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/IfStatement.java b/rhino/src/main/java/org/mozilla/javascript/ast/IfStatement.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/IfStatement.java rename to rhino/src/main/java/org/mozilla/javascript/ast/IfStatement.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/InfixExpression.java b/rhino/src/main/java/org/mozilla/javascript/ast/InfixExpression.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/InfixExpression.java rename to rhino/src/main/java/org/mozilla/javascript/ast/InfixExpression.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/Jump.java b/rhino/src/main/java/org/mozilla/javascript/ast/Jump.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/Jump.java rename to rhino/src/main/java/org/mozilla/javascript/ast/Jump.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/KeywordLiteral.java b/rhino/src/main/java/org/mozilla/javascript/ast/KeywordLiteral.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/KeywordLiteral.java rename to rhino/src/main/java/org/mozilla/javascript/ast/KeywordLiteral.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/Label.java b/rhino/src/main/java/org/mozilla/javascript/ast/Label.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/Label.java rename to rhino/src/main/java/org/mozilla/javascript/ast/Label.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/LabeledStatement.java b/rhino/src/main/java/org/mozilla/javascript/ast/LabeledStatement.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/LabeledStatement.java rename to rhino/src/main/java/org/mozilla/javascript/ast/LabeledStatement.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/LetNode.java b/rhino/src/main/java/org/mozilla/javascript/ast/LetNode.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/LetNode.java rename to rhino/src/main/java/org/mozilla/javascript/ast/LetNode.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/Loop.java b/rhino/src/main/java/org/mozilla/javascript/ast/Loop.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/Loop.java rename to rhino/src/main/java/org/mozilla/javascript/ast/Loop.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/Name.java b/rhino/src/main/java/org/mozilla/javascript/ast/Name.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/Name.java rename to rhino/src/main/java/org/mozilla/javascript/ast/Name.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/NewExpression.java b/rhino/src/main/java/org/mozilla/javascript/ast/NewExpression.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/NewExpression.java rename to rhino/src/main/java/org/mozilla/javascript/ast/NewExpression.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/NodeVisitor.java b/rhino/src/main/java/org/mozilla/javascript/ast/NodeVisitor.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/NodeVisitor.java rename to rhino/src/main/java/org/mozilla/javascript/ast/NodeVisitor.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/NumberLiteral.java b/rhino/src/main/java/org/mozilla/javascript/ast/NumberLiteral.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/NumberLiteral.java rename to rhino/src/main/java/org/mozilla/javascript/ast/NumberLiteral.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ObjectLiteral.java b/rhino/src/main/java/org/mozilla/javascript/ast/ObjectLiteral.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ObjectLiteral.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ObjectLiteral.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ObjectProperty.java b/rhino/src/main/java/org/mozilla/javascript/ast/ObjectProperty.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ObjectProperty.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ObjectProperty.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ParenthesizedExpression.java b/rhino/src/main/java/org/mozilla/javascript/ast/ParenthesizedExpression.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ParenthesizedExpression.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ParenthesizedExpression.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ParseProblem.java b/rhino/src/main/java/org/mozilla/javascript/ast/ParseProblem.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ParseProblem.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ParseProblem.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/PropertyGet.java b/rhino/src/main/java/org/mozilla/javascript/ast/PropertyGet.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/PropertyGet.java rename to rhino/src/main/java/org/mozilla/javascript/ast/PropertyGet.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/RegExpLiteral.java b/rhino/src/main/java/org/mozilla/javascript/ast/RegExpLiteral.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/RegExpLiteral.java rename to rhino/src/main/java/org/mozilla/javascript/ast/RegExpLiteral.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ReturnStatement.java b/rhino/src/main/java/org/mozilla/javascript/ast/ReturnStatement.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ReturnStatement.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ReturnStatement.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/Scope.java b/rhino/src/main/java/org/mozilla/javascript/ast/Scope.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/Scope.java rename to rhino/src/main/java/org/mozilla/javascript/ast/Scope.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ScriptNode.java b/rhino/src/main/java/org/mozilla/javascript/ast/ScriptNode.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ScriptNode.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ScriptNode.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/StringLiteral.java b/rhino/src/main/java/org/mozilla/javascript/ast/StringLiteral.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/StringLiteral.java rename to rhino/src/main/java/org/mozilla/javascript/ast/StringLiteral.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/SwitchCase.java b/rhino/src/main/java/org/mozilla/javascript/ast/SwitchCase.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/SwitchCase.java rename to rhino/src/main/java/org/mozilla/javascript/ast/SwitchCase.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/SwitchStatement.java b/rhino/src/main/java/org/mozilla/javascript/ast/SwitchStatement.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/SwitchStatement.java rename to rhino/src/main/java/org/mozilla/javascript/ast/SwitchStatement.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/Symbol.java b/rhino/src/main/java/org/mozilla/javascript/ast/Symbol.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/Symbol.java rename to rhino/src/main/java/org/mozilla/javascript/ast/Symbol.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/TaggedTemplateLiteral.java b/rhino/src/main/java/org/mozilla/javascript/ast/TaggedTemplateLiteral.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/TaggedTemplateLiteral.java rename to rhino/src/main/java/org/mozilla/javascript/ast/TaggedTemplateLiteral.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/TemplateCharacters.java b/rhino/src/main/java/org/mozilla/javascript/ast/TemplateCharacters.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/TemplateCharacters.java rename to rhino/src/main/java/org/mozilla/javascript/ast/TemplateCharacters.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/TemplateLiteral.java b/rhino/src/main/java/org/mozilla/javascript/ast/TemplateLiteral.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/TemplateLiteral.java rename to rhino/src/main/java/org/mozilla/javascript/ast/TemplateLiteral.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/ThrowStatement.java b/rhino/src/main/java/org/mozilla/javascript/ast/ThrowStatement.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/ThrowStatement.java rename to rhino/src/main/java/org/mozilla/javascript/ast/ThrowStatement.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/TryStatement.java b/rhino/src/main/java/org/mozilla/javascript/ast/TryStatement.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/TryStatement.java rename to rhino/src/main/java/org/mozilla/javascript/ast/TryStatement.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/UnaryExpression.java b/rhino/src/main/java/org/mozilla/javascript/ast/UnaryExpression.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/UnaryExpression.java rename to rhino/src/main/java/org/mozilla/javascript/ast/UnaryExpression.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/UpdateExpression.java b/rhino/src/main/java/org/mozilla/javascript/ast/UpdateExpression.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/UpdateExpression.java rename to rhino/src/main/java/org/mozilla/javascript/ast/UpdateExpression.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/VariableDeclaration.java b/rhino/src/main/java/org/mozilla/javascript/ast/VariableDeclaration.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/VariableDeclaration.java rename to rhino/src/main/java/org/mozilla/javascript/ast/VariableDeclaration.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/VariableInitializer.java b/rhino/src/main/java/org/mozilla/javascript/ast/VariableInitializer.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/VariableInitializer.java rename to rhino/src/main/java/org/mozilla/javascript/ast/VariableInitializer.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/WhileLoop.java b/rhino/src/main/java/org/mozilla/javascript/ast/WhileLoop.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/WhileLoop.java rename to rhino/src/main/java/org/mozilla/javascript/ast/WhileLoop.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/WithStatement.java b/rhino/src/main/java/org/mozilla/javascript/ast/WithStatement.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/WithStatement.java rename to rhino/src/main/java/org/mozilla/javascript/ast/WithStatement.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlDotQuery.java b/rhino/src/main/java/org/mozilla/javascript/ast/XmlDotQuery.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlDotQuery.java rename to rhino/src/main/java/org/mozilla/javascript/ast/XmlDotQuery.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlElemRef.java b/rhino/src/main/java/org/mozilla/javascript/ast/XmlElemRef.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlElemRef.java rename to rhino/src/main/java/org/mozilla/javascript/ast/XmlElemRef.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlExpression.java b/rhino/src/main/java/org/mozilla/javascript/ast/XmlExpression.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlExpression.java rename to rhino/src/main/java/org/mozilla/javascript/ast/XmlExpression.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlFragment.java b/rhino/src/main/java/org/mozilla/javascript/ast/XmlFragment.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlFragment.java rename to rhino/src/main/java/org/mozilla/javascript/ast/XmlFragment.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlLiteral.java b/rhino/src/main/java/org/mozilla/javascript/ast/XmlLiteral.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlLiteral.java rename to rhino/src/main/java/org/mozilla/javascript/ast/XmlLiteral.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlMemberGet.java b/rhino/src/main/java/org/mozilla/javascript/ast/XmlMemberGet.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlMemberGet.java rename to rhino/src/main/java/org/mozilla/javascript/ast/XmlMemberGet.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlPropRef.java b/rhino/src/main/java/org/mozilla/javascript/ast/XmlPropRef.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlPropRef.java rename to rhino/src/main/java/org/mozilla/javascript/ast/XmlPropRef.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlRef.java b/rhino/src/main/java/org/mozilla/javascript/ast/XmlRef.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlRef.java rename to rhino/src/main/java/org/mozilla/javascript/ast/XmlRef.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlString.java b/rhino/src/main/java/org/mozilla/javascript/ast/XmlString.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/XmlString.java rename to rhino/src/main/java/org/mozilla/javascript/ast/XmlString.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/ast/Yield.java b/rhino/src/main/java/org/mozilla/javascript/ast/Yield.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/ast/Yield.java rename to rhino/src/main/java/org/mozilla/javascript/ast/Yield.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/ModuleScope.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/ModuleScope.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/ModuleScope.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/ModuleScope.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/ModuleScript.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/ModuleScript.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/ModuleScript.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/ModuleScript.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/ModuleScriptProvider.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/ModuleScriptProvider.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/ModuleScriptProvider.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/ModuleScriptProvider.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/Require.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/Require.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/Require.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/Require.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/RequireBuilder.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/RequireBuilder.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/RequireBuilder.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/RequireBuilder.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/package.html b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/package.html similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/package.html rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/package.html diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/CachingModuleScriptProviderBase.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/CachingModuleScriptProviderBase.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/CachingModuleScriptProviderBase.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/CachingModuleScriptProviderBase.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/DefaultUrlConnectionExpiryCalculator.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/DefaultUrlConnectionExpiryCalculator.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/DefaultUrlConnectionExpiryCalculator.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/DefaultUrlConnectionExpiryCalculator.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/ModuleSource.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/ModuleSource.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/ModuleSource.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/ModuleSource.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/ModuleSourceProvider.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/ModuleSourceProvider.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/ModuleSourceProvider.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/ModuleSourceProvider.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/ModuleSourceProviderBase.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/ModuleSourceProviderBase.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/ModuleSourceProviderBase.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/ModuleSourceProviderBase.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/MultiModuleScriptProvider.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/MultiModuleScriptProvider.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/MultiModuleScriptProvider.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/MultiModuleScriptProvider.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/ParsedContentType.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/ParsedContentType.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/ParsedContentType.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/ParsedContentType.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/SoftCachingModuleScriptProvider.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/SoftCachingModuleScriptProvider.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/SoftCachingModuleScriptProvider.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/SoftCachingModuleScriptProvider.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/StrongCachingModuleScriptProvider.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/StrongCachingModuleScriptProvider.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/StrongCachingModuleScriptProvider.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/StrongCachingModuleScriptProvider.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/UrlConnectionExpiryCalculator.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/UrlConnectionExpiryCalculator.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/UrlConnectionExpiryCalculator.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/UrlConnectionExpiryCalculator.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/UrlConnectionSecurityDomainProvider.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/UrlConnectionSecurityDomainProvider.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/UrlConnectionSecurityDomainProvider.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/UrlConnectionSecurityDomainProvider.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/UrlModuleSourceProvider.java b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/UrlModuleSourceProvider.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/UrlModuleSourceProvider.java rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/UrlModuleSourceProvider.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/package.html b/rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/package.html similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/commonjs/module/provider/package.html rename to rhino/src/main/java/org/mozilla/javascript/commonjs/module/provider/package.html diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/debug/DebugFrame.java b/rhino/src/main/java/org/mozilla/javascript/debug/DebugFrame.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/debug/DebugFrame.java rename to rhino/src/main/java/org/mozilla/javascript/debug/DebugFrame.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/debug/DebuggableObject.java b/rhino/src/main/java/org/mozilla/javascript/debug/DebuggableObject.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/debug/DebuggableObject.java rename to rhino/src/main/java/org/mozilla/javascript/debug/DebuggableObject.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/debug/DebuggableScript.java b/rhino/src/main/java/org/mozilla/javascript/debug/DebuggableScript.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/debug/DebuggableScript.java rename to rhino/src/main/java/org/mozilla/javascript/debug/DebuggableScript.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/debug/Debugger.java b/rhino/src/main/java/org/mozilla/javascript/debug/Debugger.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/debug/Debugger.java rename to rhino/src/main/java/org/mozilla/javascript/debug/Debugger.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/jdk18/VMBridge_jdk18.java b/rhino/src/main/java/org/mozilla/javascript/jdk18/VMBridge_jdk18.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/jdk18/VMBridge_jdk18.java rename to rhino/src/main/java/org/mozilla/javascript/jdk18/VMBridge_jdk18.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/json/JsonParser.java b/rhino/src/main/java/org/mozilla/javascript/json/JsonParser.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/json/JsonParser.java rename to rhino/src/main/java/org/mozilla/javascript/json/JsonParser.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/optimizer/Block.java b/rhino/src/main/java/org/mozilla/javascript/optimizer/Block.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/optimizer/Block.java rename to rhino/src/main/java/org/mozilla/javascript/optimizer/Block.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/optimizer/BodyCodegen.java b/rhino/src/main/java/org/mozilla/javascript/optimizer/BodyCodegen.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/optimizer/BodyCodegen.java rename to rhino/src/main/java/org/mozilla/javascript/optimizer/BodyCodegen.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/optimizer/ClassCompiler.java b/rhino/src/main/java/org/mozilla/javascript/optimizer/ClassCompiler.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/optimizer/ClassCompiler.java rename to rhino/src/main/java/org/mozilla/javascript/optimizer/ClassCompiler.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/optimizer/Codegen.java b/rhino/src/main/java/org/mozilla/javascript/optimizer/Codegen.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/optimizer/Codegen.java rename to rhino/src/main/java/org/mozilla/javascript/optimizer/Codegen.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/optimizer/OptFunctionNode.java b/rhino/src/main/java/org/mozilla/javascript/optimizer/OptFunctionNode.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/optimizer/OptFunctionNode.java rename to rhino/src/main/java/org/mozilla/javascript/optimizer/OptFunctionNode.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/optimizer/OptRuntime.java b/rhino/src/main/java/org/mozilla/javascript/optimizer/OptRuntime.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/optimizer/OptRuntime.java rename to rhino/src/main/java/org/mozilla/javascript/optimizer/OptRuntime.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/optimizer/OptTransformer.java b/rhino/src/main/java/org/mozilla/javascript/optimizer/OptTransformer.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/optimizer/OptTransformer.java rename to rhino/src/main/java/org/mozilla/javascript/optimizer/OptTransformer.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/optimizer/Optimizer.java b/rhino/src/main/java/org/mozilla/javascript/optimizer/Optimizer.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/optimizer/Optimizer.java rename to rhino/src/main/java/org/mozilla/javascript/optimizer/Optimizer.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/regexp/NativeRegExp.java b/rhino/src/main/java/org/mozilla/javascript/regexp/NativeRegExp.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/regexp/NativeRegExp.java rename to rhino/src/main/java/org/mozilla/javascript/regexp/NativeRegExp.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/regexp/NativeRegExpCallable.java b/rhino/src/main/java/org/mozilla/javascript/regexp/NativeRegExpCallable.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/regexp/NativeRegExpCallable.java rename to rhino/src/main/java/org/mozilla/javascript/regexp/NativeRegExpCallable.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/regexp/NativeRegExpCtor.java b/rhino/src/main/java/org/mozilla/javascript/regexp/NativeRegExpCtor.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/regexp/NativeRegExpCtor.java rename to rhino/src/main/java/org/mozilla/javascript/regexp/NativeRegExpCtor.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/regexp/NativeRegExpInstantiator.java b/rhino/src/main/java/org/mozilla/javascript/regexp/NativeRegExpInstantiator.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/regexp/NativeRegExpInstantiator.java rename to rhino/src/main/java/org/mozilla/javascript/regexp/NativeRegExpInstantiator.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/regexp/RegExpImpl.java b/rhino/src/main/java/org/mozilla/javascript/regexp/RegExpImpl.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/regexp/RegExpImpl.java rename to rhino/src/main/java/org/mozilla/javascript/regexp/RegExpImpl.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/regexp/SubString.java b/rhino/src/main/java/org/mozilla/javascript/regexp/SubString.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/regexp/SubString.java rename to rhino/src/main/java/org/mozilla/javascript/regexp/SubString.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/serialize/ScriptableInputStream.java b/rhino/src/main/java/org/mozilla/javascript/serialize/ScriptableInputStream.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/serialize/ScriptableInputStream.java rename to rhino/src/main/java/org/mozilla/javascript/serialize/ScriptableInputStream.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/serialize/ScriptableOutputStream.java b/rhino/src/main/java/org/mozilla/javascript/serialize/ScriptableOutputStream.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/serialize/ScriptableOutputStream.java rename to rhino/src/main/java/org/mozilla/javascript/serialize/ScriptableOutputStream.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/ByteIo.java b/rhino/src/main/java/org/mozilla/javascript/typedarrays/ByteIo.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/ByteIo.java rename to rhino/src/main/java/org/mozilla/javascript/typedarrays/ByteIo.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/Conversions.java b/rhino/src/main/java/org/mozilla/javascript/typedarrays/Conversions.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/Conversions.java rename to rhino/src/main/java/org/mozilla/javascript/typedarrays/Conversions.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeArrayBuffer.java b/rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeArrayBuffer.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeArrayBuffer.java rename to rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeArrayBuffer.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeArrayBufferView.java b/rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeArrayBufferView.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeArrayBufferView.java rename to rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeArrayBufferView.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeDataView.java b/rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeDataView.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeDataView.java rename to rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeDataView.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeFloat32Array.java b/rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeFloat32Array.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeFloat32Array.java rename to rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeFloat32Array.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeFloat64Array.java b/rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeFloat64Array.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeFloat64Array.java rename to rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeFloat64Array.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeInt16Array.java b/rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeInt16Array.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeInt16Array.java rename to rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeInt16Array.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeInt32Array.java b/rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeInt32Array.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeInt32Array.java rename to rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeInt32Array.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeInt8Array.java b/rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeInt8Array.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeInt8Array.java rename to rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeInt8Array.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeTypedArrayIterator.java b/rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeTypedArrayIterator.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeTypedArrayIterator.java rename to rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeTypedArrayIterator.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeTypedArrayView.java b/rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeTypedArrayView.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeTypedArrayView.java rename to rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeTypedArrayView.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeUint16Array.java b/rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeUint16Array.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeUint16Array.java rename to rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeUint16Array.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeUint32Array.java b/rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeUint32Array.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeUint32Array.java rename to rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeUint32Array.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeUint8Array.java b/rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeUint8Array.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeUint8Array.java rename to rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeUint8Array.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeUint8ClampedArray.java b/rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeUint8ClampedArray.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/typedarrays/NativeUint8ClampedArray.java rename to rhino/src/main/java/org/mozilla/javascript/typedarrays/NativeUint8ClampedArray.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/v8dtoa/CachedPowers.java b/rhino/src/main/java/org/mozilla/javascript/v8dtoa/CachedPowers.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/v8dtoa/CachedPowers.java rename to rhino/src/main/java/org/mozilla/javascript/v8dtoa/CachedPowers.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/v8dtoa/DiyFp.java b/rhino/src/main/java/org/mozilla/javascript/v8dtoa/DiyFp.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/v8dtoa/DiyFp.java rename to rhino/src/main/java/org/mozilla/javascript/v8dtoa/DiyFp.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/v8dtoa/DoubleConversion.java b/rhino/src/main/java/org/mozilla/javascript/v8dtoa/DoubleConversion.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/v8dtoa/DoubleConversion.java rename to rhino/src/main/java/org/mozilla/javascript/v8dtoa/DoubleConversion.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/v8dtoa/DoubleHelper.java b/rhino/src/main/java/org/mozilla/javascript/v8dtoa/DoubleHelper.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/v8dtoa/DoubleHelper.java rename to rhino/src/main/java/org/mozilla/javascript/v8dtoa/DoubleHelper.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/v8dtoa/FastDtoa.java b/rhino/src/main/java/org/mozilla/javascript/v8dtoa/FastDtoa.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/v8dtoa/FastDtoa.java rename to rhino/src/main/java/org/mozilla/javascript/v8dtoa/FastDtoa.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/v8dtoa/FastDtoaBuilder.java b/rhino/src/main/java/org/mozilla/javascript/v8dtoa/FastDtoaBuilder.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/v8dtoa/FastDtoaBuilder.java rename to rhino/src/main/java/org/mozilla/javascript/v8dtoa/FastDtoaBuilder.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/xml/XMLLib.java b/rhino/src/main/java/org/mozilla/javascript/xml/XMLLib.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/xml/XMLLib.java rename to rhino/src/main/java/org/mozilla/javascript/xml/XMLLib.java diff --git a/rhino-runtime/src/main/java/org/mozilla/javascript/xml/XMLObject.java b/rhino/src/main/java/org/mozilla/javascript/xml/XMLObject.java similarity index 100% rename from rhino-runtime/src/main/java/org/mozilla/javascript/xml/XMLObject.java rename to rhino/src/main/java/org/mozilla/javascript/xml/XMLObject.java diff --git a/rhino-runtime/src/main/resources/org/mozilla/javascript/resources/Messages.properties b/rhino/src/main/resources/org/mozilla/javascript/resources/Messages.properties similarity index 100% rename from rhino-runtime/src/main/resources/org/mozilla/javascript/resources/Messages.properties rename to rhino/src/main/resources/org/mozilla/javascript/resources/Messages.properties diff --git a/rhino-runtime/src/main/resources/org/mozilla/javascript/resources/Messages_en.properties b/rhino/src/main/resources/org/mozilla/javascript/resources/Messages_en.properties similarity index 100% rename from rhino-runtime/src/main/resources/org/mozilla/javascript/resources/Messages_en.properties rename to rhino/src/main/resources/org/mozilla/javascript/resources/Messages_en.properties diff --git a/rhino-runtime/src/main/resources/org/mozilla/javascript/resources/Messages_fr.properties b/rhino/src/main/resources/org/mozilla/javascript/resources/Messages_fr.properties similarity index 100% rename from rhino-runtime/src/main/resources/org/mozilla/javascript/resources/Messages_fr.properties rename to rhino/src/main/resources/org/mozilla/javascript/resources/Messages_fr.properties diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/EqualObjectGraphsTest.java b/rhino/src/test/java/org/mozilla/javascript/EqualObjectGraphsTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/EqualObjectGraphsTest.java rename to rhino/src/test/java/org/mozilla/javascript/EqualObjectGraphsTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/SlotMapTest.java b/rhino/src/test/java/org/mozilla/javascript/SlotMapTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/SlotMapTest.java rename to rhino/src/test/java/org/mozilla/javascript/SlotMapTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/ThreadSafeScriptableObjectTest.java b/rhino/src/test/java/org/mozilla/javascript/ThreadSafeScriptableObjectTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/ThreadSafeScriptableObjectTest.java rename to rhino/src/test/java/org/mozilla/javascript/ThreadSafeScriptableObjectTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/ApplyOnPrimitiveNumberTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/ApplyOnPrimitiveNumberTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/ApplyOnPrimitiveNumberTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/ApplyOnPrimitiveNumberTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/ArrowFnPositionBugTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/ArrowFnPositionBugTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/ArrowFnPositionBugTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/ArrowFnPositionBugTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/AvoidObjectDetectionTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/AvoidObjectDetectionTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/AvoidObjectDetectionTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/AvoidObjectDetectionTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/BigIntTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/BigIntTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/BigIntTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/BigIntTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug409702Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug409702Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug409702Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug409702Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug412433Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug412433Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug412433Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug412433Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug419940Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug419940Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug419940Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug419940Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug421071Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug421071Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug421071Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug421071Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug448816Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug448816Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug448816Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug448816Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug466207Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug466207Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug466207Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug466207Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug467396Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug467396Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug467396Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug467396Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug482203Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug482203Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug482203Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug482203Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug491621Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug491621Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug491621Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug491621Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug492525Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug492525Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug492525Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug492525Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug496585Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug496585Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug496585Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug496585Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug637811Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug637811Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug637811Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug637811Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug685403Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug685403Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug685403Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug685403Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug687669Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug687669Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug687669Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug687669Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug688018Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug688018Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug688018Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug688018Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug688021Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug688021Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug688021Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug688021Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug688023Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug688023Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug688023Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug688023Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug689308Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug689308Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug689308Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug689308Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug689314Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug689314Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug689314Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug689314Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug708801Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug708801Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug708801Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug708801Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug714204Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug714204Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug714204Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug714204Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug782363Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug782363Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug782363Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug782363Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug783797Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug783797Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug783797Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug783797Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug789277Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Bug789277Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Bug789277Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Bug789277Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/BugGetterSetterTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/BugGetterSetterTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/BugGetterSetterTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/BugGetterSetterTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/BugXmlMemberGetToSource.java b/rhino/src/test/java/org/mozilla/javascript/tests/BugXmlMemberGetToSource.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/BugXmlMemberGetToSource.java rename to rhino/src/test/java/org/mozilla/javascript/tests/BugXmlMemberGetToSource.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/CatchTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/CatchTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/CatchTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/CatchTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/ClassShutterExceptionTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/ClassShutterExceptionTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/ClassShutterExceptionTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/ClassShutterExceptionTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/CodegenTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/CodegenTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/CodegenTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/CodegenTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/ConsStringTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/ConsStringTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/ConsStringTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/ConsStringTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/ContextFactoryTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/ContextFactoryTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/ContextFactoryTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/ContextFactoryTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/ContinuationsApiTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/ContinuationsApiTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/ContinuationsApiTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/ContinuationsApiTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/CustomSetterAcceptNullScriptableTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/CustomSetterAcceptNullScriptableTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/CustomSetterAcceptNullScriptableTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/CustomSetterAcceptNullScriptableTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/DecompileTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/DecompileTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/DecompileTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/DecompileTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/DefineClassMapInheritance.java b/rhino/src/test/java/org/mozilla/javascript/tests/DefineClassMapInheritance.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/DefineClassMapInheritance.java rename to rhino/src/test/java/org/mozilla/javascript/tests/DefineClassMapInheritance.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/DefineClassTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/DefineClassTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/DefineClassTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/DefineClassTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/DefineFunctionPropertiesTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/DefineFunctionPropertiesTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/DefineFunctionPropertiesTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/DefineFunctionPropertiesTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/DelegatorTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/DelegatorTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/DelegatorTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/DelegatorTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/DeletePropertyTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/DeletePropertyTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/DeletePropertyTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/DeletePropertyTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/DynamicScopeTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/DynamicScopeTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/DynamicScopeTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/DynamicScopeTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/ErrorHandlingTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/ErrorHandlingTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/ErrorHandlingTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/ErrorHandlingTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/ErrorPropertiesTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/ErrorPropertiesTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/ErrorPropertiesTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/ErrorPropertiesTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/ForEachForOfTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/ForEachForOfTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/ForEachForOfTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/ForEachForOfTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/FunctionTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/FunctionTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/FunctionTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/FunctionTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/GeneratedClassNameTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/GeneratedClassNameTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/GeneratedClassNameTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/GeneratedClassNameTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/GeneratedMethodNameTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/GeneratedMethodNameTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/GeneratedMethodNameTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/GeneratedMethodNameTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/GlobalParseXTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/GlobalParseXTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/GlobalParseXTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/GlobalParseXTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/IndexTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/IndexTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/IndexTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/IndexTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/InitializationTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/InitializationTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/InitializationTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/InitializationTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/InterfaceAdapterTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/InterfaceAdapterTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/InterfaceAdapterTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/InterfaceAdapterTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Issue1041Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Issue1041Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Issue1041Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Issue1041Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Issue1206Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Issue1206Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Issue1206Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Issue1206Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Issue129Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Issue129Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Issue129Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Issue129Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Issue176Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Issue176Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Issue176Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Issue176Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Issue385Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Issue385Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Issue385Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Issue385Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Issue533Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Issue533Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Issue533Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Issue533Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Issue808Test.java b/rhino/src/test/java/org/mozilla/javascript/tests/Issue808Test.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Issue808Test.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Issue808Test.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/IterableTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/IterableTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/IterableTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/IterableTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/JavaAdapterTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/JavaAdapterTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/JavaAdapterTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/JavaAdapterTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/JavaIterableTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/JavaIterableTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/JavaIterableTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/JavaIterableTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/KitTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/KitTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/KitTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/KitTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/LookupSetterTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/LookupSetterTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/LookupSetterTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/LookupSetterTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/MemberBoxCallTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/MemberBoxCallTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/MemberBoxCallTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/MemberBoxCallTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/MessageProviderLanguageTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/MessageProviderLanguageTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/MessageProviderLanguageTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/MessageProviderLanguageTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/NativeArrayBufferTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/NativeArrayBufferTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/NativeArrayBufferTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/NativeArrayBufferTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/NativeArrayTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/NativeArrayTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/NativeArrayTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/NativeArrayTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/NativeJavaObjectTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/NativeJavaObjectTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/NativeJavaObjectTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/NativeJavaObjectTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/NativeJsonTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/NativeJsonTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/NativeJsonTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/NativeJsonTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/NativeRegExpTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/NativeRegExpTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/NativeRegExpTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/NativeRegExpTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/NativeStringTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/NativeStringTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/NativeStringTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/NativeStringTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/OverloadTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/OverloadTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/OverloadTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/OverloadTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/PrimitiveTypeScopeResolutionTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/PrimitiveTypeScopeResolutionTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/PrimitiveTypeScopeResolutionTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/PrimitiveTypeScopeResolutionTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/SortingTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/SortingTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/SortingTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/SortingTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/ToNumberConversionsTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/ToNumberConversionsTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/ToNumberConversionsTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/ToNumberConversionsTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/ToNumberLegacyConversionsTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/ToNumberLegacyConversionsTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/ToNumberLegacyConversionsTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/ToNumberLegacyConversionsTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/TypeOfTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/TypeOfTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/TypeOfTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/TypeOfTest.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/Utils.java b/rhino/src/test/java/org/mozilla/javascript/tests/Utils.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/Utils.java rename to rhino/src/test/java/org/mozilla/javascript/tests/Utils.java diff --git a/rhino-runtime/src/test/java/org/mozilla/javascript/tests/WrapFactoryTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/WrapFactoryTest.java similarity index 100% rename from rhino-runtime/src/test/java/org/mozilla/javascript/tests/WrapFactoryTest.java rename to rhino/src/test/java/org/mozilla/javascript/tests/WrapFactoryTest.java diff --git a/rhino-runtime/src/test/resources/org/mozilla/javascript/tests/Bug482203.js b/rhino/src/test/resources/org/mozilla/javascript/tests/Bug482203.js similarity index 100% rename from rhino-runtime/src/test/resources/org/mozilla/javascript/tests/Bug482203.js rename to rhino/src/test/resources/org/mozilla/javascript/tests/Bug482203.js diff --git a/rhino-runtime/src/test/resources/org/mozilla/javascript/tests/Issue176.js b/rhino/src/test/resources/org/mozilla/javascript/tests/Issue176.js similarity index 100% rename from rhino-runtime/src/test/resources/org/mozilla/javascript/tests/Issue176.js rename to rhino/src/test/resources/org/mozilla/javascript/tests/Issue176.js diff --git a/settings.gradle b/settings.gradle index 8b743a3485..7f93453260 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ rootProject.name = 'rhino' -include 'rhino-engine', 'rhino-runtime', 'rhino-tools', 'rhino-xml', 'examples', 'rhino', 'tests', 'benchmarks' +include 'rhino', 'rhino-engine', 'rhino-tools', 'rhino-xml', 'rhino-all', 'examples', 'tests', 'benchmarks' diff --git a/tests/build.gradle b/tests/build.gradle index 25c11a7aea..390926c3b4 100644 --- a/tests/build.gradle +++ b/tests/build.gradle @@ -7,7 +7,7 @@ plugins { dependencies { implementation project(':rhino-engine') implementation project(':examples') - implementation project(':rhino-runtime') + implementation project(':rhino') implementation project(':rhino-tools') implementation project(':rhino-xml') } @@ -47,6 +47,11 @@ test { if (System.getProperty('updateTest262properties') != null) { systemProperty 'updateTest262properties', System.getProperty('updateTest262properties') } + + jacoco { + // These particular tests produce Jacoco exceptions because of their size + excludes = ['**perlstress**'] + } } jacocoTestReport {