diff --git a/build.sbt b/build.sbt index 808cbd2bfa0f..df8e5fdfd43f 100644 --- a/build.sbt +++ b/build.sbt @@ -385,6 +385,7 @@ lazy val enso = (project in file(".")) `test-utils`, `text-buffer`, `version-output`, + `ydoc-polyfill`, `ydoc-server`, `zio-wrapper` ) @@ -649,7 +650,7 @@ lazy val componentModulesIds = "org.netbeans.api" % "org-netbeans-modules-sampler" % netbeansApiVersion, (`runtime-language-arrow` / projectID).value, (`syntax-rust-definition` / projectID).value, - (`ydoc-server` / projectID).value, + (`ydoc-polyfill` / projectID).value, (`profiling-utils` / projectID).value ) } @@ -738,7 +739,7 @@ lazy val componentModulesPaths = (`language-server-deps-wrapper` / Compile / exportedModuleBin).value, (`directory-watcher-wrapper` / Compile / exportedModuleBin).value, (`jna-wrapper` / Compile / exportedModuleBin).value, - (`ydoc-server` / Compile / exportedModuleBin).value, + (`ydoc-polyfill` / Compile / exportedModuleBin).value, (`library-manager` / Compile / exportedModuleBin).value, (`logging-config` / Compile / exportedModuleBin).value, (`logging-utils` / Compile / exportedModuleBin).value, @@ -1724,7 +1725,7 @@ lazy val `project-manager` = (project in file("lib/scala/project-manager")) Test / addModules := Seq( (`syntax-rust-definition` / javaModuleName).value, (`profiling-utils` / javaModuleName).value, - (`ydoc-server` / javaModuleName).value + (`ydoc-polyfill` / javaModuleName).value ), Test / moduleDependencies := { GraalVM.modules ++ GraalVM.langsPkgs ++ logbackPkg ++ helidon ++ Seq( @@ -1735,7 +1736,7 @@ lazy val `project-manager` = (project in file("lib/scala/project-manager")) Test / internalModuleDependencies := Seq( (`profiling-utils` / Compile / exportedModule).value, (`syntax-rust-definition` / Compile / exportedModule).value, - (`ydoc-server` / Compile / exportedModule).value + (`ydoc-polyfill` / Compile / exportedModule).value ), Test / javaOptions ++= testLogProviderOptions, Test / test := (Test / test).dependsOn(buildEngineDistribution).value @@ -1783,7 +1784,7 @@ lazy val `project-manager` = (project in file("lib/scala/project-manager")) .dependsOn(testkit % Test) .dependsOn(`runtime-version-manager-test` % Test) .dependsOn(`logging-service-logback` % "test->test") - .dependsOn(`ydoc-server` % Test) + .dependsOn(`ydoc-polyfill` % Test) .dependsOn(`profiling-utils` % Test) lazy val `json-rpc-server` = project @@ -1885,13 +1886,49 @@ lazy val searcher = project .dependsOn(testkit % Test) .dependsOn(`polyglot-api`) +lazy val `ydoc-polyfill` = project + .in(file("lib/java/ydoc-polyfill")) + .enablePlugins(JPMSPlugin) + .configs(Test) + .settings( + customFrgaalJavaCompilerSettings("21"), + javaModuleName := "org.enso.ydoc.polyfill", + Compile / exportJars := true, + crossPaths := false, + autoScalaLibrary := false, + Test / fork := true, + commands += WithDebugCommand.withDebug, + Compile / moduleDependencies ++= { + GraalVM.modules ++ GraalVM.jsPkgs ++ GraalVM.chromeInspectorPkgs ++ helidon ++ Seq( + "org.slf4j" % "slf4j-api" % slf4jVersion + ) + }, + Compile / internalModuleDependencies := Seq( + (`syntax-rust-definition` / Compile / exportedModule).value + ), + libraryDependencies ++= Seq( + "org.graalvm.truffle" % "truffle-api" % graalMavenPackagesVersion % "provided", + "org.graalvm.polyglot" % "inspect-community" % graalMavenPackagesVersion % "runtime", + "org.graalvm.polyglot" % "js-community" % graalMavenPackagesVersion % "runtime", + "org.slf4j" % "slf4j-api" % slf4jVersion, + "io.helidon.webclient" % "helidon-webclient-websocket" % helidonVersion, + "io.helidon.webserver" % "helidon-webserver-websocket" % helidonVersion, + "junit" % "junit" % junitVersion % Test, + "com.github.sbt" % "junit-interface" % junitIfVersion % Test + ), + libraryDependencies ++= { + GraalVM.modules ++ GraalVM.jsPkgs ++ GraalVM.chromeInspectorPkgs ++ helidon + } + ) + .dependsOn(`syntax-rust-definition`) + lazy val `ydoc-server` = project .in(file("lib/java/ydoc-server")) .enablePlugins(JPMSPlugin) .configs(Test) .settings( customFrgaalJavaCompilerSettings("21"), - javaModuleName := "org.enso.ydoc", + javaModuleName := "org.enso.ydoc.server", Compile / exportJars := true, crossPaths := false, autoScalaLibrary := false, @@ -1903,8 +1940,8 @@ lazy val `ydoc-server` = project ) }, Compile / internalModuleDependencies := Seq( - (`syntax-rust-definition` / Compile / exportedModule).value, - (`profiling-utils` / Compile / exportedModule).value + (`ydoc-polyfill` / Compile / exportedModule).value, + (`syntax-rust-definition` / Compile / exportedModule).value ), libraryDependencies ++= Seq( "org.graalvm.truffle" % "truffle-api" % graalMavenPackagesVersion % "provided", @@ -1912,8 +1949,9 @@ lazy val `ydoc-server` = project "org.graalvm.polyglot" % "inspect-community" % graalMavenPackagesVersion % "runtime", "org.graalvm.polyglot" % "js-community" % graalMavenPackagesVersion % "runtime", "org.slf4j" % "slf4j-api" % slf4jVersion, - "io.helidon.webclient" % "helidon-webclient-websocket" % helidonVersion, - "io.helidon.webserver" % "helidon-webserver-websocket" % helidonVersion, + "io.helidon.common" % "helidon-common" % helidonVersion, + "io.helidon.webclient" % "helidon-webclient-websocket" % helidonVersion % Test, + "io.helidon.webserver" % "helidon-webserver-websocket" % helidonVersion % Test, "junit" % "junit" % junitVersion % Test, "com.github.sbt" % "junit-interface" % junitIfVersion % Test, "com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion % Test @@ -1936,8 +1974,7 @@ lazy val `ydoc-server` = project // would result in an sbt caught in an infinite recursion. // Compile / run / javaOptions ++= { - val mp = - (Compile / modulePath).value ++ (`profiling-utils` / Compile / modulePath).value + val mp = (Compile / modulePath).value val jar = (Compile / exportedProductJars).value.head val modName = javaModuleName.value val allMp = mp ++ Seq(jar.data.absolutePath) @@ -1969,7 +2006,7 @@ lazy val `ydoc-server` = project .buildNativeImage( "ydoc", staticOnLinux = false, - mainClass = Some("org.enso.ydoc.Main") + mainClass = Some("org.enso.ydoc.server.Main") ) .value, buildNativeImage := NativeImage @@ -1979,7 +2016,7 @@ lazy val `ydoc-server` = project ) .value ) - .dependsOn(`syntax-rust-definition`) + .dependsOn(`ydoc-polyfill`) .dependsOn(`logging-service-logback`) lazy val `persistance` = (project in file("lib/java/persistance")) @@ -2257,7 +2294,7 @@ lazy val `language-server` = (project in file("engine/language-server")) (`language-server-deps-wrapper` / Compile / exportedModule).value, (`directory-watcher-wrapper` / Compile / exportedModule).value, (`engine-runner-common` / Compile / exportedModule).value, - (`ydoc-server` / Compile / exportedModule).value, + (`ydoc-polyfill` / Compile / exportedModule).value, (`logging-utils` / Compile / exportedModule).value, (`logging-utils-akka` / Compile / exportedModule).value, (`logging-service` / Compile / exportedModule).value, @@ -2342,7 +2379,7 @@ lazy val `language-server` = (project in file("engine/language-server")) (`runtime-instrument-repl-debugger` / Compile / exportedModule).value, (`runtime-instrument-id-execution` / Compile / exportedModule).value, (`runtime-language-epb` / Compile / exportedModule).value, - (`ydoc-server` / Compile / exportedModule).value, + (`ydoc-polyfill` / Compile / exportedModule).value, (`syntax-rust-definition` / Compile / exportedModule).value, (`profiling-utils` / Compile / exportedModule).value, (`logging-service-logback` / Compile / exportedModule).value, @@ -2394,7 +2431,7 @@ lazy val `language-server` = (project in file("engine/language-server")) javaModuleName.value, (`syntax-rust-definition` / javaModuleName).value, (`profiling-utils` / javaModuleName).value, - (`ydoc-server` / javaModuleName).value, + (`ydoc-polyfill` / javaModuleName).value, (`library-manager` / javaModuleName).value ), Test / addReads := { @@ -2449,7 +2486,7 @@ lazy val `language-server` = (project in file("engine/language-server")) .dependsOn(`logging-service-logback` % "test->test") .dependsOn(`library-manager-test` % Test) .dependsOn(`runtime-version-manager-test` % Test) - .dependsOn(`ydoc-server`) + .dependsOn(`ydoc-polyfill`) lazy val cleanInstruments = taskKey[Unit]( "Cleans fragile class files to force a full recompilation and preserve" + @@ -2866,7 +2903,7 @@ lazy val `runtime-integration-tests` = (`runtime-instrument-repl-debugger` / Compile / exportedModule).value, (`runtime-instrument-id-execution` / Compile / exportedModule).value, (`runtime-language-epb` / Compile / exportedModule).value, - (`ydoc-server` / Compile / exportedModule).value, + (`ydoc-polyfill` / Compile / exportedModule).value, (`syntax-rust-definition` / Compile / exportedModule).value, (`profiling-utils` / Compile / exportedModule).value, (`logging-service-logback` / Compile / exportedModule).value, @@ -2916,7 +2953,7 @@ lazy val `runtime-integration-tests` = "scala.library", (`runtime` / javaModuleName).value, (`runtime-test-instruments` / javaModuleName).value, - (`ydoc-server` / javaModuleName).value, + (`ydoc-polyfill` / javaModuleName).value, (`runtime-instrument-common` / javaModuleName).value, (`text-buffer` / javaModuleName).value, (`logging-service-logback` / Test / javaModuleName).value, @@ -3031,7 +3068,7 @@ lazy val `runtime-benchmarks` = (`runtime-instrument-id-execution` / Compile / exportedModule).value, (`runtime-language-epb` / Compile / exportedModule).value, (`runtime-language-arrow` / Compile / exportedModule).value, - (`ydoc-server` / Compile / exportedModule).value, + (`ydoc-polyfill` / Compile / exportedModule).value, (`benchmarks-common` / Compile / exportedModule).value, (`syntax-rust-definition` / Compile / exportedModule).value, (`profiling-utils` / Compile / exportedModule).value, @@ -4049,7 +4086,7 @@ lazy val `std-benchmarks` = (project in file("std-bits/benchmarks")) }.evaluated ) .dependsOn(`bench-processor`) - .dependsOn(`ydoc-server`) + .dependsOn(`ydoc-polyfill`) .dependsOn(`runtime-language-arrow`) .dependsOn(`syntax-rust-definition`) .dependsOn(`profiling-utils`) diff --git a/distribution/engine/THIRD-PARTY/NOTICE b/distribution/engine/THIRD-PARTY/NOTICE index 73506659c0fc..8f0701367375 100644 --- a/distribution/engine/THIRD-PARTY/NOTICE +++ b/distribution/engine/THIRD-PARTY/NOTICE @@ -1,16 +1,6 @@ Enso Copyright 2020 - 2024 New Byte Order sp. z o. o. -'logback-classic', licensed under the GNU Lesser General Public License, is distributed with the engine. -The license file can be found at `licenses/GNU_Lesser_General_Public_License`. -Copyright notices related to this dependency can be found in the directory `ch.qos.logback.logback-classic-1.3.7`. - - -'logback-core', licensed under the GNU Lesser General Public License, is distributed with the engine. -The license file can be found at `licenses/GNU_Lesser_General_Public_License`. -Copyright notices related to this dependency can be found in the directory `ch.qos.logback.logback-core-1.3.7`. - - 'shapeless_2.13', licensed under the Apache 2, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. Copyright notices related to this dependency can be found in the directory `com.chuusai.shapeless_2.13-2.3.10`. @@ -371,16 +361,6 @@ The license file can be found at `licenses/APACHE2.0`. Copyright notices related to this dependency can be found in the directory `io.methvin.directory-watcher-0.18.0`. -'sentry', licensed under the MIT, is distributed with the engine. -The license file can be found at `licenses/MIT`. -Copyright notices related to this dependency can be found in the directory `io.sentry.sentry-6.28.0`. - - -'sentry-logback', licensed under the MIT, is distributed with the engine. -The license file can be found at `licenses/MIT`. -Copyright notices related to this dependency can be found in the directory `io.sentry.sentry-logback-6.28.0`. - - 'jakarta.inject-api', licensed under the The Apache Software License, Version 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. Copyright notices related to this dependency can be found in the directory `jakarta.inject.jakarta.inject-api-2.0.1`. diff --git a/distribution/engine/THIRD-PARTY/ch.qos.logback.logback-classic-1.3.7/NOTICES b/distribution/engine/THIRD-PARTY/ch.qos.logback.logback-classic-1.3.7/NOTICES deleted file mode 100644 index e0c201ae2b8f..000000000000 --- a/distribution/engine/THIRD-PARTY/ch.qos.logback.logback-classic-1.3.7/NOTICES +++ /dev/null @@ -1,3 +0,0 @@ -Copyright (C) 1999-2010, QOS.ch. All rights reserved. - -Copyright (C) 1999-2015, QOS.ch. All rights reserved. diff --git a/distribution/engine/THIRD-PARTY/ch.qos.logback.logback-core-1.3.7/NOTICES b/distribution/engine/THIRD-PARTY/ch.qos.logback.logback-core-1.3.7/NOTICES deleted file mode 100644 index 2700cac3a625..000000000000 --- a/distribution/engine/THIRD-PARTY/ch.qos.logback.logback-core-1.3.7/NOTICES +++ /dev/null @@ -1,3 +0,0 @@ -Copyright (C) 1999-2002, QOS.ch. All rights reserved. - -Logback: the reliable, generic, fast and flexible logging framework. Copyright (C) 1999-2015, QOS.ch. All rights diff --git a/distribution/engine/THIRD-PARTY/io.sentry.sentry-6.28.0/NOTICES b/distribution/engine/THIRD-PARTY/io.sentry.sentry-6.28.0/NOTICES deleted file mode 100644 index c866911f9e78..000000000000 --- a/distribution/engine/THIRD-PARTY/io.sentry.sentry-6.28.0/NOTICES +++ /dev/null @@ -1,3 +0,0 @@ -Copyright (C) 2010 Google Inc. - -this work for additional information regarding copyright ownership. diff --git a/distribution/engine/THIRD-PARTY/io.sentry.sentry-logback-6.28.0/NOTICES b/distribution/engine/THIRD-PARTY/io.sentry.sentry-logback-6.28.0/NOTICES deleted file mode 100644 index 17c7e5c47094..000000000000 --- a/distribution/engine/THIRD-PARTY/io.sentry.sentry-logback-6.28.0/NOTICES +++ /dev/null @@ -1,3 +0,0 @@ -Copyright (C) 2010 Google Inc. - - diff --git a/distribution/engine/THIRD-PARTY/licenses/GNU_Lesser_General_Public_License b/distribution/engine/THIRD-PARTY/licenses/GNU_Lesser_General_Public_License deleted file mode 100644 index 4362b49151d7..000000000000 --- a/distribution/engine/THIRD-PARTY/licenses/GNU_Lesser_General_Public_License +++ /dev/null @@ -1,502 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/engine/language-server/src/main/java/module-info.java b/engine/language-server/src/main/java/module-info.java index 40493d9e5e96..6af1ceab6c0c 100644 --- a/engine/language-server/src/main/java/module-info.java +++ b/engine/language-server/src/main/java/module-info.java @@ -36,7 +36,7 @@ requires org.enso.version.output; requires org.enso.text.buffer; requires org.enso.task.progress.notifications; - requires org.enso.ydoc; + requires org.enso.ydoc.polyfill; exports org.enso.languageserver.boot; exports org.enso.languageserver.filemanager to scala.library; diff --git a/engine/language-server/src/main/java/org/enso/languageserver/boot/resource/YdocInitialization.java b/engine/language-server/src/main/java/org/enso/languageserver/boot/resource/YdocInitialization.java deleted file mode 100644 index 1d3795deb8dc..000000000000 --- a/engine/language-server/src/main/java/org/enso/languageserver/boot/resource/YdocInitialization.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.enso.languageserver.boot.resource; - -import java.util.concurrent.Executor; -import org.enso.languageserver.boot.ComponentSupervisor; -import org.enso.languageserver.boot.config.ApplicationConfig; -import org.enso.ydoc.Ydoc; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public final class YdocInitialization extends LockedInitialization { - - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private final ComponentSupervisor supervisor; - private final String ENABLED_YDOC = "POLYGLOT_YDOC_SERVER"; - - public YdocInitialization(Executor executor, ComponentSupervisor componentSupervisor) { - super(executor); - this.supervisor = componentSupervisor; - } - - @Override - public void initComponent() { - var ydocEnabled = - System.getenv(ENABLED_YDOC) == null - ? false - : Boolean.parseBoolean(System.getenv(ENABLED_YDOC)); - if (ydocEnabled) { - logger.debug("Starting Ydoc server..."); - var applicationConfig = ApplicationConfig.load(); - var ydoc = - Ydoc.builder() - .hostname(applicationConfig.ydoc().hostname()) - .port(applicationConfig.ydoc().port()) - .build(); - try { - ydoc.start(); - this.supervisor.registerService(ydoc); - } catch (Exception e) { - throw new RuntimeException(e); - } - logger.debug("Started Ydoc server"); - } else { - logger.debug("Reverting to Node.js Ydoc"); - } - } -} diff --git a/engine/language-server/src/main/scala/org/enso/languageserver/boot/MainModule.scala b/engine/language-server/src/main/scala/org/enso/languageserver/boot/MainModule.scala index cea1efbc101e..93d369b146c2 100644 --- a/engine/language-server/src/main/scala/org/enso/languageserver/boot/MainModule.scala +++ b/engine/language-server/src/main/scala/org/enso/languageserver/boot/MainModule.scala @@ -80,7 +80,6 @@ class MainModule(serverConfig: LanguageServerConfig, logLevel: Level) { logLevel ) - private val ydocSupervisor = new ComponentSupervisor() private val contextSupervisor = new ComponentSupervisor() private val utcClock = Clock.systemUTC() @@ -434,8 +433,7 @@ class MainModule(serverConfig: LanguageServerConfig, logLevel: Level) { suggestionsRepo, builder, contextSupervisor, - zioRuntime, - ydocSupervisor + zioRuntime )(system.dispatcher) private val jsonRpcControllerFactory = new JsonConnectionControllerFactory( @@ -509,7 +507,6 @@ class MainModule(serverConfig: LanguageServerConfig, logLevel: Level) { suggestionsRepo.close() contextSupervisor.close() runtimeEventsMonitor.close() - ydocSupervisor.close() log.info("Stopped Language Server") } diff --git a/engine/language-server/src/main/scala/org/enso/languageserver/boot/ResourcesInitialization.scala b/engine/language-server/src/main/scala/org/enso/languageserver/boot/ResourcesInitialization.scala index 058e5bcd051c..67c663fd07f7 100644 --- a/engine/language-server/src/main/scala/org/enso/languageserver/boot/ResourcesInitialization.scala +++ b/engine/language-server/src/main/scala/org/enso/languageserver/boot/ResourcesInitialization.scala @@ -10,7 +10,6 @@ import org.enso.languageserver.boot.resource.{ RepoInitialization, SequentialResourcesInitialization, TruffleContextInitialization, - YdocInitialization, ZioRuntimeInitialization } import org.enso.languageserver.data.ProjectDirectoriesConfig @@ -31,9 +30,9 @@ object ResourcesInitialization { * @param directoriesConfig configuration of directories that should be created * @param protocolFactory the JSON-RPC protocol factory * @param suggestionsRepo the suggestions repo - * @param truffleContext the runtime context + * @param truffleContextBuilder the runtime context + * @param truffleContextSupervisor the runtime component supervisor * @param runtime the runtime to run effects - * @param ydoc the ydoc server * @return the initialization component */ def apply( @@ -43,8 +42,7 @@ object ResourcesInitialization { suggestionsRepo: InMemorySuggestionsRepo, truffleContextBuilder: ContextFactory, truffleContextSupervisor: ComponentSupervisor, - runtime: effect.Runtime, - ydocSupervisor: ComponentSupervisor + runtime: effect.Runtime )(implicit ec: ExecutionContextExecutor): InitializationComponent = { new SequentialResourcesInitialization( ec, @@ -63,8 +61,7 @@ object ResourcesInitialization { truffleContextBuilder, truffleContextSupervisor, eventStream - ), - new YdocInitialization(ec, ydocSupervisor) + ) ) ) } diff --git a/lib/java/ydoc-polyfill/src/main/java/module-info.java b/lib/java/ydoc-polyfill/src/main/java/module-info.java new file mode 100644 index 000000000000..48a3cef49c1b --- /dev/null +++ b/lib/java/ydoc-polyfill/src/main/java/module-info.java @@ -0,0 +1,14 @@ +module org.enso.ydoc.polyfill { + requires io.helidon.webclient; + requires io.helidon.webclient.websocket; + requires io.helidon.webserver; + requires io.helidon.webserver.websocket; + requires org.enso.syntax; + requires org.graalvm.polyglot; + requires org.slf4j; + + opens org.enso.ydoc.polyfill.web; + + exports org.enso.ydoc.polyfill; + exports org.enso.ydoc.polyfill.web; +} diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Polyfill.java b/lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/Polyfill.java similarity index 100% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/Polyfill.java rename to lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/Polyfill.java diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/Arguments.java b/lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/Arguments.java similarity index 100% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/Arguments.java rename to lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/Arguments.java diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/ParserPolyfill.java b/lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/ParserPolyfill.java similarity index 100% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/ParserPolyfill.java rename to lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/ParserPolyfill.java diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/AbortController.java b/lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/AbortController.java similarity index 100% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/AbortController.java rename to lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/AbortController.java diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Crypto.java b/lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/Crypto.java similarity index 100% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Crypto.java rename to lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/Crypto.java diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/EventEmitter.java b/lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/EventEmitter.java similarity index 100% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/EventEmitter.java rename to lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/EventEmitter.java diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/EventTarget.java b/lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/EventTarget.java similarity index 100% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/EventTarget.java rename to lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/EventTarget.java diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Performance.java b/lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/Performance.java similarity index 100% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Performance.java rename to lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/Performance.java diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Timers.java b/lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/Timers.java similarity index 100% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Timers.java rename to lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/Timers.java diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/URL.java b/lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/URL.java similarity index 100% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/URL.java rename to lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/URL.java diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Util.java b/lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/Util.java similarity index 100% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Util.java rename to lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/Util.java diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/WebEnvironment.java b/lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/WebEnvironment.java similarity index 100% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/WebEnvironment.java rename to lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/WebEnvironment.java diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/WebSocket.java b/lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/WebSocket.java similarity index 100% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/WebSocket.java rename to lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/WebSocket.java diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Zlib.java b/lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/Zlib.java similarity index 100% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Zlib.java rename to lib/java/ydoc-polyfill/src/main/java/org/enso/ydoc/polyfill/web/Zlib.java diff --git a/lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/parser.js b/lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/parser.js similarity index 100% rename from lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/parser.js rename to lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/parser.js diff --git a/lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/abort-controller.js b/lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/abort-controller.js similarity index 100% rename from lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/abort-controller.js rename to lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/abort-controller.js diff --git a/lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/crypto.js b/lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/crypto.js similarity index 100% rename from lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/crypto.js rename to lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/crypto.js diff --git a/lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/event-emitter.js b/lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/event-emitter.js similarity index 100% rename from lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/event-emitter.js rename to lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/event-emitter.js diff --git a/lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/event-target.js b/lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/event-target.js similarity index 100% rename from lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/event-target.js rename to lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/event-target.js diff --git a/lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/performance.js b/lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/performance.js similarity index 100% rename from lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/performance.js rename to lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/performance.js diff --git a/lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/timers.js b/lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/timers.js similarity index 100% rename from lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/timers.js rename to lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/timers.js diff --git a/lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/util.js b/lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/util.js similarity index 100% rename from lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/util.js rename to lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/util.js diff --git a/lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/websocket.js b/lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/websocket.js similarity index 100% rename from lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/websocket.js rename to lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/websocket.js diff --git a/lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/zlib.js b/lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/zlib.js similarity index 100% rename from lib/java/ydoc-server/src/main/resources/org/enso/ydoc/polyfill/web/zlib.js rename to lib/java/ydoc-polyfill/src/main/resources/org/enso/ydoc/polyfill/web/zlib.js diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/ExecutorSetup.java b/lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/ExecutorSetup.java similarity index 100% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/ExecutorSetup.java rename to lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/ExecutorSetup.java diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/ParserPolyfillTest.java b/lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/ParserPolyfillTest.java similarity index 100% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/ParserPolyfillTest.java rename to lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/ParserPolyfillTest.java diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/AbortControllerTest.java b/lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/AbortControllerTest.java similarity index 100% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/AbortControllerTest.java rename to lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/AbortControllerTest.java diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/CryptoTest.java b/lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/CryptoTest.java similarity index 100% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/CryptoTest.java rename to lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/CryptoTest.java diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/EventEmitterTest.java b/lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/EventEmitterTest.java similarity index 100% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/EventEmitterTest.java rename to lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/EventEmitterTest.java diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/EventTargetTest.java b/lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/EventTargetTest.java similarity index 100% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/EventTargetTest.java rename to lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/EventTargetTest.java diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/PerformanceTest.java b/lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/PerformanceTest.java similarity index 100% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/PerformanceTest.java rename to lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/PerformanceTest.java diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/TimersTest.java b/lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/TimersTest.java similarity index 100% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/TimersTest.java rename to lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/TimersTest.java diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/UtilTest.java b/lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/UtilTest.java similarity index 100% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/UtilTest.java rename to lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/UtilTest.java diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/WebSocketServerTest.java b/lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/WebSocketServerTest.java similarity index 100% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/WebSocketServerTest.java rename to lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/WebSocketServerTest.java diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/WebSocketTest.java b/lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/WebSocketTest.java similarity index 100% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/WebSocketTest.java rename to lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/WebSocketTest.java diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/ZlibTest.java b/lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/ZlibTest.java similarity index 100% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/polyfill/web/ZlibTest.java rename to lib/java/ydoc-polyfill/src/test/java/org/enso/ydoc/polyfill/web/ZlibTest.java diff --git a/lib/java/ydoc-polyfill/src/test/resources/logback-test.xml b/lib/java/ydoc-polyfill/src/test/resources/logback-test.xml new file mode 100644 index 000000000000..3ce331ce1a62 --- /dev/null +++ b/lib/java/ydoc-polyfill/src/test/resources/logback-test.xml @@ -0,0 +1,17 @@ + + + + + + + + + + %d{HH:mm:ss.SSS} [%-15thread] %-5level %logger{36} %msg%n + + + + + + + diff --git a/lib/java/ydoc-server/src/main/java/module-info.java b/lib/java/ydoc-server/src/main/java/module-info.java index 238adbca83d9..e6d344b40b44 100644 --- a/lib/java/ydoc-server/src/main/java/module-info.java +++ b/lib/java/ydoc-server/src/main/java/module-info.java @@ -1,14 +1,9 @@ -module org.enso.ydoc { - requires io.helidon.webclient; - requires io.helidon.webclient.websocket; - requires io.helidon.webserver; - requires io.helidon.webserver.websocket; - requires org.enso.syntax; +module org.enso.ydoc.server { + requires io.helidon.common; + requires org.enso.ydoc.polyfill; requires org.graalvm.polyglot; requires org.slf4j; requires static org.graalvm.nativeimage; - opens org.enso.ydoc.polyfill.web; - - exports org.enso.ydoc; + exports org.enso.ydoc.server; } diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Main.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/server/Main.java similarity index 96% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/Main.java rename to lib/java/ydoc-server/src/main/java/org/enso/ydoc/server/Main.java index adf36cb7e905..f205882dad73 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Main.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/server/Main.java @@ -1,4 +1,4 @@ -package org.enso.ydoc; +package org.enso.ydoc.server; import java.util.concurrent.Semaphore; diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Ydoc.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/server/Ydoc.java similarity index 99% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/Ydoc.java rename to lib/java/ydoc-server/src/main/java/org/enso/ydoc/server/Ydoc.java index 228eed0b77a2..379ccee2bfc8 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Ydoc.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/server/Ydoc.java @@ -1,4 +1,4 @@ -package org.enso.ydoc; +package org.enso.ydoc.server; import java.io.IOException; import java.util.concurrent.CompletableFuture; diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/server/nativeimage/Target_ExecutorsFactory.java similarity index 94% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java rename to lib/java/ydoc-server/src/main/java/org/enso/ydoc/server/nativeimage/Target_ExecutorsFactory.java index ff1b5fe110b0..cab765867ecf 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/server/nativeimage/Target_ExecutorsFactory.java @@ -1,4 +1,4 @@ -package org.enso.ydoc.polyfill.web; +package org.enso.ydoc.server.nativeimage; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_LoomClient.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/server/nativeimage/Target_LoomClient.java similarity index 95% rename from lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_LoomClient.java rename to lib/java/ydoc-server/src/main/java/org/enso/ydoc/server/nativeimage/Target_LoomClient.java index 13e44c486dd3..6157591b9f28 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_LoomClient.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/server/nativeimage/Target_LoomClient.java @@ -1,4 +1,4 @@ -package org.enso.ydoc.polyfill.web; +package org.enso.ydoc.server.nativeimage; import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.RecomputeFieldValue; diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/result/FileListResult.java b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/result/FileListResult.java deleted file mode 100644 index 92e8da00dd69..000000000000 --- a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/result/FileListResult.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.enso.ydoc.jsonrpc.model.result; - -import java.util.List; -import org.enso.ydoc.jsonrpc.model.FileSystemObject; - -public record FileListResult(List paths) implements Result {} diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/result/Result.java b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/result/Result.java deleted file mode 100644 index f94dd6f49306..000000000000 --- a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/result/Result.java +++ /dev/null @@ -1,3 +0,0 @@ -package org.enso.ydoc.jsonrpc.model.result; - -public interface Result {} diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/YdocTest.java b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/YdocTest.java similarity index 92% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/YdocTest.java rename to lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/YdocTest.java index 05a0355378b3..a09b747f106f 100644 --- a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/YdocTest.java +++ b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/YdocTest.java @@ -1,4 +1,4 @@ -package org.enso.ydoc; +package org.enso.ydoc.server; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -18,15 +18,15 @@ import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import org.enso.ydoc.jsonrpc.JsonRpcRequest; -import org.enso.ydoc.jsonrpc.JsonRpcResponse; -import org.enso.ydoc.jsonrpc.model.ContentRoot; -import org.enso.ydoc.jsonrpc.model.FilePath; -import org.enso.ydoc.jsonrpc.model.FileSystemObject; -import org.enso.ydoc.jsonrpc.model.WriteCapability; -import org.enso.ydoc.jsonrpc.model.result.FileListResult; -import org.enso.ydoc.jsonrpc.model.result.InitProtocolConnectionResult; -import org.enso.ydoc.jsonrpc.model.result.TextOpenFileResult; +import org.enso.ydoc.server.jsonrpc.JsonRpcRequest; +import org.enso.ydoc.server.jsonrpc.JsonRpcResponse; +import org.enso.ydoc.server.jsonrpc.model.ContentRoot; +import org.enso.ydoc.server.jsonrpc.model.FilePath; +import org.enso.ydoc.server.jsonrpc.model.FileSystemObject; +import org.enso.ydoc.server.jsonrpc.model.WriteCapability; +import org.enso.ydoc.server.jsonrpc.model.result.FileListResult; +import org.enso.ydoc.server.jsonrpc.model.result.InitProtocolConnectionResult; +import org.enso.ydoc.server.jsonrpc.model.result.TextOpenFileResult; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/JsonRpcRequest.java b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/JsonRpcRequest.java similarity index 78% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/JsonRpcRequest.java rename to lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/JsonRpcRequest.java index c28722cfda6d..3400f06df5a1 100644 --- a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/JsonRpcRequest.java +++ b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/JsonRpcRequest.java @@ -1,4 +1,4 @@ -package org.enso.ydoc.jsonrpc; +package org.enso.ydoc.server.jsonrpc; import com.fasterxml.jackson.databind.JsonNode; diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/JsonRpcResponse.java b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/JsonRpcResponse.java similarity index 77% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/JsonRpcResponse.java rename to lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/JsonRpcResponse.java index f446e2fc4c56..2fd67b711ffd 100644 --- a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/JsonRpcResponse.java +++ b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/JsonRpcResponse.java @@ -1,6 +1,6 @@ -package org.enso.ydoc.jsonrpc; +package org.enso.ydoc.server.jsonrpc; -import org.enso.ydoc.jsonrpc.model.result.Result; +import org.enso.ydoc.server.jsonrpc.model.result.Result; public record JsonRpcResponse(String jsonrpc, String id, Result result) { diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/ContentRoot.java b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/ContentRoot.java similarity index 79% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/ContentRoot.java rename to lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/ContentRoot.java index 74fc9d13efc8..7021f96c154e 100644 --- a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/ContentRoot.java +++ b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/ContentRoot.java @@ -1,4 +1,4 @@ -package org.enso.ydoc.jsonrpc.model; +package org.enso.ydoc.server.jsonrpc.model; import java.util.UUID; diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/FilePath.java b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/FilePath.java similarity index 71% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/FilePath.java rename to lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/FilePath.java index b1bff5849d8c..661ecd065392 100644 --- a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/FilePath.java +++ b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/FilePath.java @@ -1,4 +1,4 @@ -package org.enso.ydoc.jsonrpc.model; +package org.enso.ydoc.server.jsonrpc.model; import java.util.List; import java.util.UUID; diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/FileSystemObject.java b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/FileSystemObject.java similarity index 82% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/FileSystemObject.java rename to lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/FileSystemObject.java index 4fdfbe2a6a8f..fd9174a4878b 100644 --- a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/FileSystemObject.java +++ b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/FileSystemObject.java @@ -1,4 +1,4 @@ -package org.enso.ydoc.jsonrpc.model; +package org.enso.ydoc.server.jsonrpc.model; public record FileSystemObject(String type, String name, FilePath path) { diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/WriteCapability.java b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/WriteCapability.java similarity index 72% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/WriteCapability.java rename to lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/WriteCapability.java index abce6fef3a45..153ef52555ff 100644 --- a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/WriteCapability.java +++ b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/WriteCapability.java @@ -1,4 +1,4 @@ -package org.enso.ydoc.jsonrpc.model; +package org.enso.ydoc.server.jsonrpc.model; public record WriteCapability(String method, Options registerOptions) { diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/result/FileListResult.java b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/result/FileListResult.java new file mode 100644 index 000000000000..7f27853fa613 --- /dev/null +++ b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/result/FileListResult.java @@ -0,0 +1,6 @@ +package org.enso.ydoc.server.jsonrpc.model.result; + +import java.util.List; +import org.enso.ydoc.server.jsonrpc.model.FileSystemObject; + +public record FileListResult(List paths) implements Result {} diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/result/InitProtocolConnectionResult.java b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/result/InitProtocolConnectionResult.java similarity index 61% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/result/InitProtocolConnectionResult.java rename to lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/result/InitProtocolConnectionResult.java index 3a0dad0d39a1..226d21934007 100644 --- a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/result/InitProtocolConnectionResult.java +++ b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/result/InitProtocolConnectionResult.java @@ -1,7 +1,7 @@ -package org.enso.ydoc.jsonrpc.model.result; +package org.enso.ydoc.server.jsonrpc.model.result; import java.util.List; -import org.enso.ydoc.jsonrpc.model.ContentRoot; +import org.enso.ydoc.server.jsonrpc.model.ContentRoot; public record InitProtocolConnectionResult( String ensoVersion, String currentEdition, List contentRoots) implements Result {} diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/result/Result.java b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/result/Result.java new file mode 100644 index 000000000000..16e0058b05d6 --- /dev/null +++ b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/result/Result.java @@ -0,0 +1,3 @@ +package org.enso.ydoc.server.jsonrpc.model.result; + +public interface Result {} diff --git a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/result/TextOpenFileResult.java b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/result/TextOpenFileResult.java similarity index 54% rename from lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/result/TextOpenFileResult.java rename to lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/result/TextOpenFileResult.java index 88c2317672d5..1bbd4ff75244 100644 --- a/lib/java/ydoc-server/src/test/java/org/enso/ydoc/jsonrpc/model/result/TextOpenFileResult.java +++ b/lib/java/ydoc-server/src/test/java/org/enso/ydoc/server/jsonrpc/model/result/TextOpenFileResult.java @@ -1,6 +1,6 @@ -package org.enso.ydoc.jsonrpc.model.result; +package org.enso.ydoc.server.jsonrpc.model.result; -import org.enso.ydoc.jsonrpc.model.WriteCapability; +import org.enso.ydoc.server.jsonrpc.model.WriteCapability; public record TextOpenFileResult( WriteCapability writeCapability, String content, String currentVersion) implements Result {} diff --git a/project/Ydoc.scala b/project/Ydoc.scala index 762e3b0eccf3..dbb6e5b0b9f5 100644 --- a/project/Ydoc.scala +++ b/project/Ydoc.scala @@ -50,7 +50,7 @@ object Ydoc { val generator = Tracked.inputChanged[Seq[File], Seq[File]](store) { case (changed, _) => val resourceYdocServerJs = - ydocServerResourceManaged / "org" / "enso" / "ydoc" / "ydoc.cjs" + ydocServerResourceManaged / "org" / "enso" / "ydoc" / "server" / "ydoc.cjs" if (changed) { val command = s"$pnpmCommand -r compile" diff --git a/tools/legal-review/engine/ch.qos.logback.logback-classic-1.3.7/copyright-ignore b/tools/legal-review/engine/ch.qos.logback.logback-classic-1.3.7/copyright-ignore deleted file mode 100644 index 55158ebca753..000000000000 --- a/tools/legal-review/engine/ch.qos.logback.logback-classic-1.3.7/copyright-ignore +++ /dev/null @@ -1,3 +0,0 @@ -Copyright (C) 1999-2012, QOS.ch. All rights reserved. -Copyright (C) 1999-2021, QOS.ch. All rights reserved. -Copyright (C) 1999-2022, QOS.ch. All rights reserved. diff --git a/tools/legal-review/engine/ch.qos.logback.logback-classic-1.3.7/copyright-keep b/tools/legal-review/engine/ch.qos.logback.logback-classic-1.3.7/copyright-keep deleted file mode 100644 index 8ef0866a52a1..000000000000 --- a/tools/legal-review/engine/ch.qos.logback.logback-classic-1.3.7/copyright-keep +++ /dev/null @@ -1,2 +0,0 @@ -Copyright (C) 1999-2010, QOS.ch. All rights reserved. -Copyright (C) 1999-2015, QOS.ch. All rights reserved. diff --git a/tools/legal-review/engine/ch.qos.logback.logback-core-1.3.7/copyright-ignore b/tools/legal-review/engine/ch.qos.logback.logback-core-1.3.7/copyright-ignore deleted file mode 100644 index debaddd3b088..000000000000 --- a/tools/legal-review/engine/ch.qos.logback.logback-core-1.3.7/copyright-ignore +++ /dev/null @@ -1,3 +0,0 @@ -Copyright (C) 1999-2015, QOS.ch. All rights reserved. -Copyright (C) 1999-2021, QOS.ch. All rights reserved. -Copyright (C) 1999-2022, QOS.ch. All rights reserved. diff --git a/tools/legal-review/engine/ch.qos.logback.logback-core-1.3.7/copyright-keep b/tools/legal-review/engine/ch.qos.logback.logback-core-1.3.7/copyright-keep deleted file mode 100644 index def50491fecb..000000000000 --- a/tools/legal-review/engine/ch.qos.logback.logback-core-1.3.7/copyright-keep +++ /dev/null @@ -1,2 +0,0 @@ -Copyright (C) 1999-2002, QOS.ch. All rights reserved. -Logback: the reliable, generic, fast and flexible logging framework. Copyright (C) 1999-2015, QOS.ch. All rights diff --git a/tools/legal-review/engine/io.sentry.sentry-6.28.0/copyright-keep b/tools/legal-review/engine/io.sentry.sentry-6.28.0/copyright-keep deleted file mode 100644 index 92cb39d1b600..000000000000 --- a/tools/legal-review/engine/io.sentry.sentry-6.28.0/copyright-keep +++ /dev/null @@ -1,2 +0,0 @@ -Copyright (C) 2010 Google Inc. -this work for additional information regarding copyright ownership. diff --git a/tools/legal-review/engine/io.sentry.sentry-6.28.0/files-ignore b/tools/legal-review/engine/io.sentry.sentry-6.28.0/files-ignore deleted file mode 100644 index a78d222b4f28..000000000000 --- a/tools/legal-review/engine/io.sentry.sentry-6.28.0/files-ignore +++ /dev/null @@ -1 +0,0 @@ -io/sentry/vendor/gson/LICENSE diff --git a/tools/legal-review/engine/io.sentry.sentry-6.28.0/files-keep b/tools/legal-review/engine/io.sentry.sentry-6.28.0/files-keep deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tools/legal-review/engine/io.sentry.sentry-logback-6.28.0/copyright-add b/tools/legal-review/engine/io.sentry.sentry-logback-6.28.0/copyright-add deleted file mode 100644 index ea5d1206874e..000000000000 --- a/tools/legal-review/engine/io.sentry.sentry-logback-6.28.0/copyright-add +++ /dev/null @@ -1,2 +0,0 @@ -Copyright (C) 2010 Google Inc. - diff --git a/tools/legal-review/engine/io.sentry.sentry-logback-6.28.0/files-ignore b/tools/legal-review/engine/io.sentry.sentry-logback-6.28.0/files-ignore deleted file mode 100644 index 7cfb96480698..000000000000 --- a/tools/legal-review/engine/io.sentry.sentry-logback-6.28.0/files-ignore +++ /dev/null @@ -1 +0,0 @@ -/getsentry/sentry-java/blob/main/LICENSE diff --git a/tools/legal-review/engine/io.sentry.sentry-logback-6.28.0/files-keep b/tools/legal-review/engine/io.sentry.sentry-logback-6.28.0/files-keep deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tools/legal-review/engine/report-state b/tools/legal-review/engine/report-state index 6ae7ebd1092c..047c7be3e777 100644 --- a/tools/legal-review/engine/report-state +++ b/tools/legal-review/engine/report-state @@ -1,3 +1,3 @@ -17B7561F9A5547456DB58D715BF8FFA09A3A57656942004846CBE87C1B4DFC28 -7B45943C89E109092F1FC330E1B2481EFA36F5D9387E15FDE6F195DE247FF2A8 +420453723CD8943E16C160D0EF9331E55F3D8D1EAD9C0817DC71755794C641A6 +DCC05A7CA7244AE43F2758CECE4ACEFA5EC362B4D247077BF0679F270E3864AA 0