Updated Linux start scripts to be called membrane.sh, migrated Window… (membrane#1574)

* Updated Linux start scripts to be called membrane.sh, migrated Windows scripts to CMD from PS1.

* Ammend

* Ammend

* Fixed example test startup mechanism for windows

* Ammend

* Load balancing example test windows scripts fixes

* Windows paths with spaces fix on RouterCLI proxies.xml resolving

* Quickfix

* Fix Windows main starter script

Author: t-burch

README.md

@@ -93,8 +93,8 @@ A versatile and lightweight **API Gateway** for **REST** and **legacy SOAP Web S
 2. **Start the Gateway**
   - Open a terminal in the extracted directory.
   - Run the appropriate command for your operating system:
-    - **Linux/Mac:** `./service-proxy.sh`
-    - **Windows:** `service-proxy.ps1`
+    - **Linux/Mac:** `./membrane.sh`
+    - **Windows:** `membrane.cmd`
 
 3. **Access the Gateway**
   - Open your browser and navigate to [http://localhost:2000](http://localhost:2000).

core/src/main/java/com/predic8/membrane/core/cli/MembraneCommandLine.java

@@ -33,13 +33,13 @@ private static Options getRootOptions() {
     }
 
     private static @NotNull CliCommand getRootNamespace(Options rootOptions) {
-        return new CliCommand("service-proxy.sh", "Membrane Service Proxy") {{
+        return new CliCommand("membrane.sh", "Membrane Service Proxy") {{
             setOptions(rootOptions);
 
             addExample("Start gateway configured from OpenAPI file",
-                    "service-proxy.sh oas -l conf/fruitshop-api.yml")
+                    "membrane.sh oas -l conf/fruitshop-api.yml")
                     .addExample("Start gateway configured from OpenAPI URL and validate requests",
-                            "service-proxy.sh oas -v -l https://api.predic8.de/shop/v2/api-docs");
+                            "membrane.sh oas -v -l https://api.predic8.de/shop/v2/api-docs");
 
             addSubcommand(new CliCommand("start", " (Default) Same function as command omitted. Start gateway with configuration from proxies.xml") {{
                 setOptions(rootOptions);

core/src/main/java/com/predic8/membrane/core/cli/RouterCLI.java

@@ -32,6 +32,7 @@
 import static com.predic8.membrane.core.openapi.serviceproxy.OpenAPISpec.YesNoOpenAPIOption.*;
 import static com.predic8.membrane.core.util.ExceptionUtil.concatMessageAndCauseMessages;
 import static com.predic8.membrane.core.util.OSUtil.*;
+import static com.predic8.membrane.core.util.URIUtil.pathFromFileURI;
 import static java.lang.Integer.*;
 
 public class RouterCLI {
@@ -171,21 +172,21 @@ private static boolean shouldResolveFile(String s) {
     }
 
     private static String getRulesFileFromRelativeSpec(ResolverMap rm, String relativeFile, String errorNotice) {
-        String try1 = ResolverMap.combine(prefix(getUserDir()), relativeFile);
+        String try1 = pathFromFileURI(ResolverMap.combine(prefix(getUserDir()), relativeFile));
         try(InputStream ignored = rm.resolve(try1)) {
             return try1;
         } catch (Exception e) {
-            // ignored
+            log.error("Could not resolve path to configuration (attempt 1).", e);
         }
 
         String membraneHome = System.getenv(MEMBRANE_HOME);
         String try2 = null;
         if (membraneHome != null) {
-            try2 = ResolverMap.combine(prefix(membraneHome), relativeFile);
+            try2 = pathFromFileURI(ResolverMap.combine(prefix(membraneHome), relativeFile));
             try(InputStream ignored =  rm.resolve(try2)) {
                 return try2;
             } catch (Exception e) {
-                // ignored
+                log.error("Could not resolve path to configuration (attempt 2).", e);
             }
         }
         System.err.println("Could not find Membrane's configuration file at " + try1 + (try2 == null ? "" : " and not at " + try2) + " . " + errorNotice);

core/src/main/java/com/predic8/membrane/core/interceptor/shutdown/ShutdownInterceptor.java

@@ -29,7 +29,7 @@
  *              </p>
  *              <p>
  *                  Has undefined behavior when Membrane is <b>not</b> started from command line
- *                  (=via the RouterCLI class, which <tt>service-proxy.ps1</tt>/<tt>service-proxy.sh</tt>
+ *                  (=via the RouterCLI class, which <tt>membrane.cmd</tt>/<tt>membrane.sh</tt>
  *                  do use).
  *              </p>
  *              <p>

distribution/docker/Dockerfile

@@ -17,4 +17,4 @@ RUN groupadd --gid $USER_GID $USERNAME && useradd --uid $USER_UID --gid $USER_GI
 
 USER $USERNAME
 WORKDIR /opt/membrane
-ENTRYPOINT ["./service-proxy.sh"]
+ENTRYPOINT ["./membrane.sh"]

distribution/examples/acl/README.md

@@ -13,7 +13,7 @@ To run the example execute the following steps:
 
 1. Go to the `examples/acl` directory.
 
-2. Execute `service-proxy.ps1`
+2. Execute `membrane.cmd`
 
 3. Open the URL http://localhost:2000/ in your browser. 
    The predic8.de website will be displayed in your browser.

distribution/examples/acl/membrane.cmd

@@ -0,0 +1,93 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+set "exitcode=0"
+set "required_version=21"
+
+where java >nul 2>&1
+if errorlevel 1 (
+    echo Java is not installed. Membrane needs at least Java %required_version%.
+    set "exitcode=1"
+    goto finish
+)
+
+for /f "usebackq tokens=3 delims= " %%A in (`java -version 2^>^&1 ^| findstr /i "version"`) do (
+    set "full_version=%%A"
+    goto :versionFound
+)
+
+:versionFound
+if not defined full_version (
+    echo WARNING: Could not determine Java version. Make sure Java version is at least %required_version%. Proceeding anyway...
+    goto startMembrane
+)
+set "full_version=%full_version:"=%"
+
+for /f "delims=." %%B in ("%full_version%") do (
+    set "current_version=%%B"
+)
+
+for /f "delims=0123456789" %%C in ("!current_version!") do (
+    set "nonNumeric=%%C"
+)
+if defined nonNumeric (
+    echo WARNING: Could not parse Java version. Make sure your Java version is at least %required_version%. Proceeding anyway...
+    goto startMembrane
+)
+
+if %current_version% GEQ %required_version% (
+    goto startMembrane
+) else (
+    echo Java version mismatch: Required=%required_version%, Installed=%full_version%
+    set "exitcode=1"
+    goto finish
+)
+
+:findMembraneDirectory
+set "test_dir=%~1"
+if exist "%test_dir%\conf" if exist "%test_dir%\lib" (
+    set "membrane_home=%test_dir%"
+    goto :eof
+)
+
+if "%test_dir:~1%"==":\" (
+    goto :eof
+)
+
+for %%A in ("%test_dir%") do set "parent=%%~dpA"
+if not "%parent:~0,3%"=="%parent%" (
+    set "parent=%parent:~0,-1%"
+)
+if /i "%parent%"=="%test_dir%" (
+    goto :eof
+)
+call :findMembraneDirectory "%parent%"
+goto :eof
+
+:startMembrane
+set "current=%CD%"
+set "membrane_home="
+
+call :findMembraneDirectory "%current%"
+
+if defined membrane_home (
+    call :startMembraneService "%membrane_home%"
+    set "exitcode=0"
+    goto finish
+) else (
+    echo Could not start Membrane. Ensure the directory structure is correct.
+    set "exitcode=1"
+    goto finish
+)
+
+:startMembraneService
+set "membrane_home=%~1"
+set "MEMBRANE_HOME=%membrane_home%"
+set "CLASSPATH=%membrane_home%\conf;%membrane_home%\lib\*"
+echo Starting: %membrane_home% CL: %CLASSPATH%
+java -cp "%CLASSPATH%" com.predic8.membrane.core.cli.RouterCLI -c proxies.xml
+goto :eof
+
+:finish
+pause
+exit /b %exitcode%

distribution/examples/acl/service-proxy.sh renamed to distribution/examples/acl/membrane.sh

@@ -53,7 +53,7 @@ A quick guide to setting up a JDBC-based API key store using PostgreSQL.
 4. **run service.proxy.sh script:**
 
 ```shell
-./service-proxy.sh
+./membrane.sh
 ```
 
 5. **Run SQL File in your Docker Container**

distribution/examples/acl/service-proxy.ps1

@@ -0,0 +1,93 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+set "exitcode=0"
+set "required_version=21"
+
+where java >nul 2>&1
+if errorlevel 1 (
+    echo Java is not installed. Membrane needs at least Java %required_version%.
+    set "exitcode=1"
+    goto finish
+)
+
+for /f "usebackq tokens=3 delims= " %%A in (`java -version 2^>^&1 ^| findstr /i "version"`) do (
+    set "full_version=%%A"
+    goto :versionFound
+)
+
+:versionFound
+if not defined full_version (
+    echo WARNING: Could not determine Java version. Make sure Java version is at least %required_version%. Proceeding anyway...
+    goto startMembrane
+)
+set "full_version=%full_version:"=%"
+
+for /f "delims=." %%B in ("%full_version%") do (
+    set "current_version=%%B"
+)
+
+for /f "delims=0123456789" %%C in ("!current_version!") do (
+    set "nonNumeric=%%C"
+)
+if defined nonNumeric (
+    echo WARNING: Could not parse Java version. Make sure your Java version is at least %required_version%. Proceeding anyway...
+    goto startMembrane
+)
+
+if %current_version% GEQ %required_version% (
+    goto startMembrane
+) else (
+    echo Java version mismatch: Required=%required_version%, Installed=%full_version%
+    set "exitcode=1"
+    goto finish
+)
+
+:findMembraneDirectory
+set "test_dir=%~1"
+if exist "%test_dir%\conf" if exist "%test_dir%\lib" (
+    set "membrane_home=%test_dir%"
+    goto :eof
+)
+
+if "%test_dir:~1%"==":\" (
+    goto :eof
+)
+
+for %%A in ("%test_dir%") do set "parent=%%~dpA"
+if not "%parent:~0,3%"=="%parent%" (
+    set "parent=%parent:~0,-1%"
+)
+if /i "%parent%"=="%test_dir%" (
+    goto :eof
+)
+call :findMembraneDirectory "%parent%"
+goto :eof
+
+:startMembrane
+set "current=%CD%"
+set "membrane_home="
+
+call :findMembraneDirectory "%current%"
+
+if defined membrane_home (
+    call :startMembraneService "%membrane_home%"
+    set "exitcode=0"
+    goto finish
+) else (
+    echo Could not start Membrane. Ensure the directory structure is correct.
+    set "exitcode=1"
+    goto finish
+)
+
+:startMembraneService
+set "membrane_home=%~1"
+set "MEMBRANE_HOME=%membrane_home%"
+set "CLASSPATH=%membrane_home%\conf;%membrane_home%\lib\*"
+echo Starting: %membrane_home% CL: %CLASSPATH%
+java -cp "%CLASSPATH%" com.predic8.membrane.core.cli.RouterCLI -c proxies.xml
+goto :eof
+
+:finish
+pause
+exit /b %exitcode%