Base URL placeholder added

services/com.mde-network.ep.toolfunctions.xtext/src/main/java/com/mdenetnetwork/ep/toolfunctions/xtext/XtextTool.java

@@ -70,7 +70,7 @@ public void run( String languageName, String baseName, String extension,
 		CliProjectsCreatorMain.main(args);
 
 		// Add activity files
-        final String basePackage = baseName.substring(0, baseName.lastIndexOf(".")); // Everything but last segment which is the language java class
+        final String basePackage = languageName.substring(0, languageName.lastIndexOf(".")); // Everything but last segment which is the language java class
         final String shortName = languageName.substring(languageName.lastIndexOf(".") + 1); // The last segment
         final String languagePath = PROJECT_PATH + baseName + "/src/" + basePackage.replace('.', '/');
 

static.conversion/public/conversion_tool.json

@@ -23,7 +23,7 @@
 
                 "returnType": "xmi",
 
-                "path": "http://127.0.0.1:8069/services/FlexmiToXmi"
+                "path": "{{BASE-URL}}:8069/services/FlexmiToXmi"
 
             }
 

static.emf/public/emf_tool.json

@@ -25,7 +25,7 @@
 
                     "returnType": "diagram",
 
-                    "path": "http://127.0.0.1:8070/emfatic2plantuml"
+                    "path": "{{BASE-URL}}:8070/emfatic2plantuml"
 
                 },
 

static.emfatic/public/emfatic_tool.json

@@ -23,7 +23,7 @@
 
                 "returnType": "emfatic",
 
-                "path": "http://127.0.0.1:8071/services/EcoreToEmfatic"
+                "path": "{{BASE-URL}}:8071/services/EcoreToEmfatic"
 
             },
 
@@ -37,7 +37,7 @@
 
                 "returnType": "ecore",
 
-                "path": "http://127.0.0.1:8071/services/EmfaticToEcore"
+                "path": "{{BASE-URL}}:8071/services/EmfaticToEcore"
 
             }
 

static.ocl/public/ocl_tool.json

@@ -26,7 +26,7 @@
 
                 "returnType": "text",
 
-                "path": "http://127.0.0.1:8072/services/RunOclFunction"
+                "path": "{{BASE-URL}}:8072/services/RunOclFunction"
 
             }
 

static.ocl/public/ocl_tool.yml

@@ -17,7 +17,7 @@ tool:
       type: xmi
     - name: language
       type: text
-    path: http://127.0.0.1:8072/services/RunOclFunction
+    path: {{BASE-URL}}:8072/services/RunOclFunction
     returnType: text
   panelDefs:
   - buttons:

xtext/Dockerfile

@@ -3,6 +3,9 @@
 
 FROM node:19-bullseye AS toolstaticbuild
 
+# comma delimited whitelist of base URLs (with no trailing slash) for CORS aware endpoints
+ARG TRUSTED_ORIGINS
+
 RUN apt-get update && apt-get install -y --no-install-recommends zip
 
 WORKDIR /usr/src/mdenet-tool
@@ -19,6 +22,8 @@ RUN npm install; npm run build; chmod -R 755 dist/
 # CORS configuration for webapp
 COPY xtext/acemodebundler/web.xml /usr/src/mdenet-tool/dist/WEB-INF/web.xml
 
+RUN sed -i "s|http://127.0.0.1:8080|$TRUSTED_ORIGINS|g" /usr/src/mdenet-tool/dist/WEB-INF/web.xml
+
 RUN cd dist && zip -r ROOT.war .
 
 
@@ -43,6 +48,8 @@ RUN mvn org.apache.maven.plugins:maven-dependency-plugin:3.6.0:get -Dartifact=co
 
 FROM tomcat:9.0.76-jdk17-temurin
 
+# See https://github.com/mdenet/educationplatform-docker/blob/development_server/README.md#environment-variables
+ARG ES_ADDRESS
 
 # toolserice main endpoint port
 ENV TS_PORT=9000
@@ -109,4 +116,4 @@ ENV XTEXT_ES_STOP_CRON_TIME="* 4 * * *"
 # setup cron job to periodically stop the server
 RUN ./cron-setup.sh
 
-ENTRYPOINT [ "/bin/bash", "start.sh" ]
+ENTRYPOINT [ "/bin/bash", "start.sh" ]

xtext/editorserver/src/config.js

@@ -14,7 +14,7 @@ export const config = {
 
     endpointsPrefix: process.env.ES_ENDPOINT_PREFIX || "",
 
-    trustedWebOrigins: ['http://127.0.0.1:8080'],
+    trustedWebOrigins: [process.env.TRUSTED_ORIGIN || "http://127.0.0.1:8080"],
 
 
-}
+}

xtext/start.sh

@@ -1,5 +1,10 @@
 #! /bin/bash
 
+if [ -n "${TRUSTED_ORIGINS}" ]; then
+        sed -i "s|http://127.0.0.1:8080|${TRUSTED_ORIGINS}|g" ${ES_DEPLOY_FILE_LOCATION}/ROOT/WEB-INF/web.xml
+        sed -i "s|http://127.0.0.1:8080|${TRUSTED_ORIGINS}|g" ../acemodebundler/web.xml
+fi
+
 # clean any previous editor instances and builds
 rm -rf ${ES_BUILD_LOCATION}/*
 echo Old builds cleaned.
@@ -27,4 +32,4 @@ node ./src/server.js &
 cron
 
 # wait for them all
-wait -n
+wait -n

xtext/static.xtext/public/xtext_tool.json

@@ -19,7 +19,7 @@
                                     {"name":"language", "type":"text"}],
 
                     "returnType": "text",
-                    "path": "http://127.0.0.1:9000"
+                    "path": "{{BASE-URL}}:9000"
                 }
             ],