From 71e0583c3260d4f6bff98293992ad3aa760c45cc Mon Sep 17 00:00:00 2001 From: Antonio Garcia-Dominguez Date: Tue, 3 Dec 2024 09:44:48 +0000 Subject: [PATCH] Rename http-server to ep-tool-server --- .github/workflows/main.yml | 2 +- .github/workflows/pull_requests.yml | 2 +- README.md | 8 ++++---- {http-server => ep-tool-server}/.gitignore | 0 {http-server => ep-tool-server}/README.md | 0 {http-server => ep-tool-server}/build.gradle | 2 +- {http-server => ep-tool-server}/package-lock.json | 4 ++-- {http-server => ep-tool-server}/package.json | 2 +- .../epsilon/labs/playground/Application.java | 0 .../fn/tooldesc/ToolDescriptorController.java | 0 {http-server => ep-tool-server}/src/main/js/ecl.js | 0 {http-server => ep-tool-server}/src/main/js/egl.js | 0 {http-server => ep-tool-server}/src/main/js/egx.js | 0 .../src/main/js/emfatic.js | 0 {http-server => ep-tool-server}/src/main/js/emg.js | 0 {http-server => ep-tool-server}/src/main/js/eml.js | 0 {http-server => ep-tool-server}/src/main/js/eol.js | 0 {http-server => ep-tool-server}/src/main/js/epl.js | 0 {http-server => ep-tool-server}/src/main/js/etl.js | 0 {http-server => ep-tool-server}/src/main/js/evl.js | 0 .../src/main/js/flexmi.js | 0 .../src/main/js/flock.js | 0 .../src/main/js/highlighting.js | 0 {http-server => ep-tool-server}/src/main/js/json.js | 0 .../src/main/js/pinset.js | 0 .../src/main/resources/application-http.properties | 0 .../src/main/resources/mdenet_tool.egl | 0 .../src/main/resources/public/icons.css | 0 .../src/main/resources/public/icons/ecl.png | Bin .../src/main/resources/public/icons/egl.png | Bin .../src/main/resources/public/icons/egx.png | Bin .../src/main/resources/public/icons/emfatic.png | Bin .../src/main/resources/public/icons/emg.png | Bin .../src/main/resources/public/icons/eml.png | Bin .../src/main/resources/public/icons/eol.png | Bin .../src/main/resources/public/icons/epl.png | Bin .../src/main/resources/public/icons/etl.png | Bin .../src/main/resources/public/icons/evl.png | Bin .../src/main/resources/public/icons/flexmi.png | Bin .../src/main/resources/public/icons/flock.png | Bin .../src/main/resources/public/icons/json.png | Bin .../src/main/resources/public/icons/pinset.png | Bin .../epsilon/labs/playground/StaticFilesTest.java | 0 .../fn/ToolDescriptorControllerClient.java | 0 .../playground/fn/ToolDescriptorControllerTest.java | 0 {http-server => ep-tool-server}/webpack.config.js | 0 settings.gradle | 2 +- 47 files changed, 11 insertions(+), 11 deletions(-) rename {http-server => ep-tool-server}/.gitignore (100%) rename {http-server => ep-tool-server}/README.md (100%) rename {http-server => ep-tool-server}/build.gradle (97%) rename {http-server => ep-tool-server}/package-lock.json (99%) rename {http-server => ep-tool-server}/package.json (89%) rename {http-server => ep-tool-server}/src/main/java/org/eclipse/epsilon/labs/playground/Application.java (100%) rename {http-server => ep-tool-server}/src/main/java/org/eclipse/epsilon/labs/playground/fn/tooldesc/ToolDescriptorController.java (100%) rename {http-server => ep-tool-server}/src/main/js/ecl.js (100%) rename {http-server => ep-tool-server}/src/main/js/egl.js (100%) rename {http-server => ep-tool-server}/src/main/js/egx.js (100%) rename {http-server => ep-tool-server}/src/main/js/emfatic.js (100%) rename {http-server => ep-tool-server}/src/main/js/emg.js (100%) rename {http-server => ep-tool-server}/src/main/js/eml.js (100%) rename {http-server => ep-tool-server}/src/main/js/eol.js (100%) rename {http-server => ep-tool-server}/src/main/js/epl.js (100%) rename {http-server => ep-tool-server}/src/main/js/etl.js (100%) rename {http-server => ep-tool-server}/src/main/js/evl.js (100%) rename {http-server => ep-tool-server}/src/main/js/flexmi.js (100%) rename {http-server => ep-tool-server}/src/main/js/flock.js (100%) rename {http-server => ep-tool-server}/src/main/js/highlighting.js (100%) rename {http-server => ep-tool-server}/src/main/js/json.js (100%) rename {http-server => ep-tool-server}/src/main/js/pinset.js (100%) rename {http-server => ep-tool-server}/src/main/resources/application-http.properties (100%) rename {http-server => ep-tool-server}/src/main/resources/mdenet_tool.egl (100%) rename {http-server => ep-tool-server}/src/main/resources/public/icons.css (100%) rename {http-server => ep-tool-server}/src/main/resources/public/icons/ecl.png (100%) rename {http-server => ep-tool-server}/src/main/resources/public/icons/egl.png (100%) rename {http-server => ep-tool-server}/src/main/resources/public/icons/egx.png (100%) rename {http-server => ep-tool-server}/src/main/resources/public/icons/emfatic.png (100%) rename {http-server => ep-tool-server}/src/main/resources/public/icons/emg.png (100%) rename {http-server => ep-tool-server}/src/main/resources/public/icons/eml.png (100%) rename {http-server => ep-tool-server}/src/main/resources/public/icons/eol.png (100%) rename {http-server => ep-tool-server}/src/main/resources/public/icons/epl.png (100%) rename {http-server => ep-tool-server}/src/main/resources/public/icons/etl.png (100%) rename {http-server => ep-tool-server}/src/main/resources/public/icons/evl.png (100%) rename {http-server => ep-tool-server}/src/main/resources/public/icons/flexmi.png (100%) rename {http-server => ep-tool-server}/src/main/resources/public/icons/flock.png (100%) rename {http-server => ep-tool-server}/src/main/resources/public/icons/json.png (100%) rename {http-server => ep-tool-server}/src/main/resources/public/icons/pinset.png (100%) rename {http-server => ep-tool-server}/src/test/java/org/eclipse/epsilon/labs/playground/StaticFilesTest.java (100%) rename {http-server => ep-tool-server}/src/test/java/org/eclipse/epsilon/labs/playground/fn/ToolDescriptorControllerClient.java (100%) rename {http-server => ep-tool-server}/src/test/java/org/eclipse/epsilon/labs/playground/fn/ToolDescriptorControllerTest.java (100%) rename {http-server => ep-tool-server}/webpack.config.js (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f1d1a82..a855f9e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,7 @@ jobs: node-version: '16.x' - name: Install Node dependencies run: npm ci - working-directory: ./http-server + working-directory: ./ep-tool-server - name: Push Docker Image uses: gradle/gradle-build-action@v3.1.0 with: diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml index 2a42bc4..056b914 100644 --- a/.github/workflows/pull_requests.yml +++ b/.github/workflows/pull_requests.yml @@ -23,7 +23,7 @@ jobs: node-version: '16.x' - name: Install Node dependencies run: npm ci - working-directory: ./http-server + working-directory: ./ep-tool-server - name: Build with Gradle uses: gradle/gradle-build-action@v3.1.0 with: diff --git a/README.md b/README.md index c755aad..e8e81ca 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This project provides an alternative [Micronaut](https://micronaut.io/)-based im To build this project, you will need: - [Java 17](https://adoptium.net/) (for Micronaut 4.x) -- [Node.js 16](https://nodejs.org/en) (for packing the JavaScript files in `http-server`) +- [Node.js 16](https://nodejs.org/en) (for packing the JavaScript files in `ep-tool-server`) Alternatively, you can open this project in [VS Code](https://code.visualstudio.com/) and use the provided [development container](https://code.visualstudio.com/docs/devcontainers/containers), which includes both. @@ -16,7 +16,7 @@ Alternatively, you can open this project in [VS Code](https://code.visualstudio. The project is divided into three modules: * [`core`](./core) is a library that contains most of the implementations of the microservices. -* [`http-server`](./http-server) exposes the microservices as an HTTP server, which can be distributed as an uber-JAR or as a Docker image. +* [`ep-tool-server`](./ep-tool-server) exposes the microservices as an [MDENet Education Platform tool service](https://github.com/mdenet/educationplatform/wiki/Adding-a-Tool#tool-service), which can be distributed as an uber-JAR or as a Docker image. * [`gcp-function`](./gcp-function) exposes the microservices as a Google Cloud Function, and adds an endpoint for communicating with the Google Cloud Storage API. ## Endpoints @@ -29,7 +29,7 @@ The endpoints are [CORS](https://fetch.spec.whatwg.org/)-aware: they allow reque * `POST /flexmi2plantuml`: transforms a model written in [Flexmi](https://eclipse.dev/epsilon/doc/flexmi/) that conforms to a metamodel written in Emfatic to a PlantUML class diagram. * `POST /epsilon`: runs an Epsilon script against a given set of metamodels (written in Emfatic) and models (written in Flexmi or XMI). The first model can alternatively be a JSON document. -### Additional endpoints for the HTTP server +### Additional endpoints for the EP tool server * `GET /tools`: returns a JSON document according to the [MDENet Education Platform tool specification](https://github.com/mdenet/educationplatform/wiki/Adding-a-Tool). * `GET /swagger/epsilon-playground-core-0.0.yml`: returns the OpenAPI specification for the core endpoints. @@ -62,7 +62,7 @@ This will also build uber-JAR distributions of the HTTP server and the Google Cl After the project has been built, you can build a Docker image for the HTTP server as well: ```bash -cd http-server +cd ep-tool-server ../gradlew dockerBuild ``` diff --git a/http-server/.gitignore b/ep-tool-server/.gitignore similarity index 100% rename from http-server/.gitignore rename to ep-tool-server/.gitignore diff --git a/http-server/README.md b/ep-tool-server/README.md similarity index 100% rename from http-server/README.md rename to ep-tool-server/README.md diff --git a/http-server/build.gradle b/ep-tool-server/build.gradle similarity index 97% rename from http-server/build.gradle rename to ep-tool-server/build.gradle index d179b75..e6b59d0 100644 --- a/http-server/build.gradle +++ b/ep-tool-server/build.gradle @@ -45,7 +45,7 @@ tasks.named("dockerfile") { } tasks.named("dockerBuild") { - images = ["ghcr.io/epsilonlabs/playground-micronaut:$project.version"] + images = ["ghcr.io/epsilonlabs/playground-micronaut:ep-tool-server"] } // Webpack for syntax highlighting diff --git a/http-server/package-lock.json b/ep-tool-server/package-lock.json similarity index 99% rename from http-server/package-lock.json rename to ep-tool-server/package-lock.json index a7d5245..88774a1 100644 --- a/http-server/package-lock.json +++ b/ep-tool-server/package-lock.json @@ -1,11 +1,11 @@ { - "name": "http-server", + "name": "ep-tool-server", "version": "0.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "http-server", + "name": "ep-tool-server", "version": "0.1.0", "license": "EPL-2.0", "dependencies": { diff --git a/http-server/package.json b/ep-tool-server/package.json similarity index 89% rename from http-server/package.json rename to ep-tool-server/package.json index 1324b9e..3eb7ab9 100644 --- a/http-server/package.json +++ b/ep-tool-server/package.json @@ -1,5 +1,5 @@ { - "name": "http-server", + "name": "ep-tool-server", "version": "0.1.0", "description": "HTTP server for Playground microservices", "author": "Epsilon Labs", diff --git a/http-server/src/main/java/org/eclipse/epsilon/labs/playground/Application.java b/ep-tool-server/src/main/java/org/eclipse/epsilon/labs/playground/Application.java similarity index 100% rename from http-server/src/main/java/org/eclipse/epsilon/labs/playground/Application.java rename to ep-tool-server/src/main/java/org/eclipse/epsilon/labs/playground/Application.java diff --git a/http-server/src/main/java/org/eclipse/epsilon/labs/playground/fn/tooldesc/ToolDescriptorController.java b/ep-tool-server/src/main/java/org/eclipse/epsilon/labs/playground/fn/tooldesc/ToolDescriptorController.java similarity index 100% rename from http-server/src/main/java/org/eclipse/epsilon/labs/playground/fn/tooldesc/ToolDescriptorController.java rename to ep-tool-server/src/main/java/org/eclipse/epsilon/labs/playground/fn/tooldesc/ToolDescriptorController.java diff --git a/http-server/src/main/js/ecl.js b/ep-tool-server/src/main/js/ecl.js similarity index 100% rename from http-server/src/main/js/ecl.js rename to ep-tool-server/src/main/js/ecl.js diff --git a/http-server/src/main/js/egl.js b/ep-tool-server/src/main/js/egl.js similarity index 100% rename from http-server/src/main/js/egl.js rename to ep-tool-server/src/main/js/egl.js diff --git a/http-server/src/main/js/egx.js b/ep-tool-server/src/main/js/egx.js similarity index 100% rename from http-server/src/main/js/egx.js rename to ep-tool-server/src/main/js/egx.js diff --git a/http-server/src/main/js/emfatic.js b/ep-tool-server/src/main/js/emfatic.js similarity index 100% rename from http-server/src/main/js/emfatic.js rename to ep-tool-server/src/main/js/emfatic.js diff --git a/http-server/src/main/js/emg.js b/ep-tool-server/src/main/js/emg.js similarity index 100% rename from http-server/src/main/js/emg.js rename to ep-tool-server/src/main/js/emg.js diff --git a/http-server/src/main/js/eml.js b/ep-tool-server/src/main/js/eml.js similarity index 100% rename from http-server/src/main/js/eml.js rename to ep-tool-server/src/main/js/eml.js diff --git a/http-server/src/main/js/eol.js b/ep-tool-server/src/main/js/eol.js similarity index 100% rename from http-server/src/main/js/eol.js rename to ep-tool-server/src/main/js/eol.js diff --git a/http-server/src/main/js/epl.js b/ep-tool-server/src/main/js/epl.js similarity index 100% rename from http-server/src/main/js/epl.js rename to ep-tool-server/src/main/js/epl.js diff --git a/http-server/src/main/js/etl.js b/ep-tool-server/src/main/js/etl.js similarity index 100% rename from http-server/src/main/js/etl.js rename to ep-tool-server/src/main/js/etl.js diff --git a/http-server/src/main/js/evl.js b/ep-tool-server/src/main/js/evl.js similarity index 100% rename from http-server/src/main/js/evl.js rename to ep-tool-server/src/main/js/evl.js diff --git a/http-server/src/main/js/flexmi.js b/ep-tool-server/src/main/js/flexmi.js similarity index 100% rename from http-server/src/main/js/flexmi.js rename to ep-tool-server/src/main/js/flexmi.js diff --git a/http-server/src/main/js/flock.js b/ep-tool-server/src/main/js/flock.js similarity index 100% rename from http-server/src/main/js/flock.js rename to ep-tool-server/src/main/js/flock.js diff --git a/http-server/src/main/js/highlighting.js b/ep-tool-server/src/main/js/highlighting.js similarity index 100% rename from http-server/src/main/js/highlighting.js rename to ep-tool-server/src/main/js/highlighting.js diff --git a/http-server/src/main/js/json.js b/ep-tool-server/src/main/js/json.js similarity index 100% rename from http-server/src/main/js/json.js rename to ep-tool-server/src/main/js/json.js diff --git a/http-server/src/main/js/pinset.js b/ep-tool-server/src/main/js/pinset.js similarity index 100% rename from http-server/src/main/js/pinset.js rename to ep-tool-server/src/main/js/pinset.js diff --git a/http-server/src/main/resources/application-http.properties b/ep-tool-server/src/main/resources/application-http.properties similarity index 100% rename from http-server/src/main/resources/application-http.properties rename to ep-tool-server/src/main/resources/application-http.properties diff --git a/http-server/src/main/resources/mdenet_tool.egl b/ep-tool-server/src/main/resources/mdenet_tool.egl similarity index 100% rename from http-server/src/main/resources/mdenet_tool.egl rename to ep-tool-server/src/main/resources/mdenet_tool.egl diff --git a/http-server/src/main/resources/public/icons.css b/ep-tool-server/src/main/resources/public/icons.css similarity index 100% rename from http-server/src/main/resources/public/icons.css rename to ep-tool-server/src/main/resources/public/icons.css diff --git a/http-server/src/main/resources/public/icons/ecl.png b/ep-tool-server/src/main/resources/public/icons/ecl.png similarity index 100% rename from http-server/src/main/resources/public/icons/ecl.png rename to ep-tool-server/src/main/resources/public/icons/ecl.png diff --git a/http-server/src/main/resources/public/icons/egl.png b/ep-tool-server/src/main/resources/public/icons/egl.png similarity index 100% rename from http-server/src/main/resources/public/icons/egl.png rename to ep-tool-server/src/main/resources/public/icons/egl.png diff --git a/http-server/src/main/resources/public/icons/egx.png b/ep-tool-server/src/main/resources/public/icons/egx.png similarity index 100% rename from http-server/src/main/resources/public/icons/egx.png rename to ep-tool-server/src/main/resources/public/icons/egx.png diff --git a/http-server/src/main/resources/public/icons/emfatic.png b/ep-tool-server/src/main/resources/public/icons/emfatic.png similarity index 100% rename from http-server/src/main/resources/public/icons/emfatic.png rename to ep-tool-server/src/main/resources/public/icons/emfatic.png diff --git a/http-server/src/main/resources/public/icons/emg.png b/ep-tool-server/src/main/resources/public/icons/emg.png similarity index 100% rename from http-server/src/main/resources/public/icons/emg.png rename to ep-tool-server/src/main/resources/public/icons/emg.png diff --git a/http-server/src/main/resources/public/icons/eml.png b/ep-tool-server/src/main/resources/public/icons/eml.png similarity index 100% rename from http-server/src/main/resources/public/icons/eml.png rename to ep-tool-server/src/main/resources/public/icons/eml.png diff --git a/http-server/src/main/resources/public/icons/eol.png b/ep-tool-server/src/main/resources/public/icons/eol.png similarity index 100% rename from http-server/src/main/resources/public/icons/eol.png rename to ep-tool-server/src/main/resources/public/icons/eol.png diff --git a/http-server/src/main/resources/public/icons/epl.png b/ep-tool-server/src/main/resources/public/icons/epl.png similarity index 100% rename from http-server/src/main/resources/public/icons/epl.png rename to ep-tool-server/src/main/resources/public/icons/epl.png diff --git a/http-server/src/main/resources/public/icons/etl.png b/ep-tool-server/src/main/resources/public/icons/etl.png similarity index 100% rename from http-server/src/main/resources/public/icons/etl.png rename to ep-tool-server/src/main/resources/public/icons/etl.png diff --git a/http-server/src/main/resources/public/icons/evl.png b/ep-tool-server/src/main/resources/public/icons/evl.png similarity index 100% rename from http-server/src/main/resources/public/icons/evl.png rename to ep-tool-server/src/main/resources/public/icons/evl.png diff --git a/http-server/src/main/resources/public/icons/flexmi.png b/ep-tool-server/src/main/resources/public/icons/flexmi.png similarity index 100% rename from http-server/src/main/resources/public/icons/flexmi.png rename to ep-tool-server/src/main/resources/public/icons/flexmi.png diff --git a/http-server/src/main/resources/public/icons/flock.png b/ep-tool-server/src/main/resources/public/icons/flock.png similarity index 100% rename from http-server/src/main/resources/public/icons/flock.png rename to ep-tool-server/src/main/resources/public/icons/flock.png diff --git a/http-server/src/main/resources/public/icons/json.png b/ep-tool-server/src/main/resources/public/icons/json.png similarity index 100% rename from http-server/src/main/resources/public/icons/json.png rename to ep-tool-server/src/main/resources/public/icons/json.png diff --git a/http-server/src/main/resources/public/icons/pinset.png b/ep-tool-server/src/main/resources/public/icons/pinset.png similarity index 100% rename from http-server/src/main/resources/public/icons/pinset.png rename to ep-tool-server/src/main/resources/public/icons/pinset.png diff --git a/http-server/src/test/java/org/eclipse/epsilon/labs/playground/StaticFilesTest.java b/ep-tool-server/src/test/java/org/eclipse/epsilon/labs/playground/StaticFilesTest.java similarity index 100% rename from http-server/src/test/java/org/eclipse/epsilon/labs/playground/StaticFilesTest.java rename to ep-tool-server/src/test/java/org/eclipse/epsilon/labs/playground/StaticFilesTest.java diff --git a/http-server/src/test/java/org/eclipse/epsilon/labs/playground/fn/ToolDescriptorControllerClient.java b/ep-tool-server/src/test/java/org/eclipse/epsilon/labs/playground/fn/ToolDescriptorControllerClient.java similarity index 100% rename from http-server/src/test/java/org/eclipse/epsilon/labs/playground/fn/ToolDescriptorControllerClient.java rename to ep-tool-server/src/test/java/org/eclipse/epsilon/labs/playground/fn/ToolDescriptorControllerClient.java diff --git a/http-server/src/test/java/org/eclipse/epsilon/labs/playground/fn/ToolDescriptorControllerTest.java b/ep-tool-server/src/test/java/org/eclipse/epsilon/labs/playground/fn/ToolDescriptorControllerTest.java similarity index 100% rename from http-server/src/test/java/org/eclipse/epsilon/labs/playground/fn/ToolDescriptorControllerTest.java rename to ep-tool-server/src/test/java/org/eclipse/epsilon/labs/playground/fn/ToolDescriptorControllerTest.java diff --git a/http-server/webpack.config.js b/ep-tool-server/webpack.config.js similarity index 100% rename from http-server/webpack.config.js rename to ep-tool-server/webpack.config.js diff --git a/settings.gradle b/settings.gradle index ea200f9..548c359 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,7 +2,7 @@ rootProject.name="playground-micronaut" include 'core' -include 'http-server' +include 'ep-tool-server' include 'gcp-function' dependencyResolutionManagement {