NIFIREG-140: Fix classpath for Windows
This closes #114.
Signed-off-by: Bryan Bende <bbende@apache.org>
diff --git a/nifi-registry-resources/src/main/resources/bin/dump-nifi-registry.bat b/nifi-registry-resources/src/main/resources/bin/dump-nifi-registry.bat
index 0703c2c..9134aab 100644
--- a/nifi-registry-resources/src/main/resources/bin/dump-nifi-registry.bat
+++ b/nifi-registry-resources/src/main/resources/bin/dump-nifi-registry.bat
@@ -33,13 +33,15 @@
:startNiFiRegistry
set NIFI_REGISTRY_ROOT=%~dp0..\
pushd "%NIFI_REGISTRY%"
-set LIB_DIR=lib\bootstrap
+set LIB_DIR=%NIFI_REGISTRY_ROOT%\lib
+set SHARED_DIR=%NIFI_REGISTRY_ROOT%\lib\shared
+set BOOTSTRAP_DIR=%NIFI_REGISTRY_ROOT%\lib\bootstrap
set CONF_DIR=conf
set BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf
set JAVA_ARGS=-Dorg.apache.nifi.registry.bootstrap.config.file=%BOOTSTRAP_CONF_FILE%
-SET JAVA_PARAMS=-cp %CONF_DIR%;%LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.registry.NiFiRegistry
+SET JAVA_PARAMS=-cp %CONF_DIR%;%LIB_DIR%\*;%SHARED_DIR%\*;%BOOTSTRAP_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.registry.NiFiRegistry
set BOOTSTRAP_ACTION=dump
cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %BOOTSTRAP_ACTION%
diff --git a/nifi-registry-resources/src/main/resources/bin/run-nifi-registry.bat b/nifi-registry-resources/src/main/resources/bin/run-nifi-registry.bat
index e75e627..c8d6541 100644
--- a/nifi-registry-resources/src/main/resources/bin/run-nifi-registry.bat
+++ b/nifi-registry-resources/src/main/resources/bin/run-nifi-registry.bat
@@ -34,12 +34,14 @@
set NIFI_REGISTRY_ROOT=%~dp0..
pushd "%NIFI_REGISTRY_ROOT%\"
set LIB_DIR=%NIFI_REGISTRY_ROOT%\lib
+set SHARED_DIR=%NIFI_REGISTRY_ROOT%\lib\shared
+set BOOTSTRAP_DIR=%NIFI_REGISTRY_ROOT%\lib\bootstrap
set CONF_DIR=%NIFI_REGISTRY_ROOT%\conf
set BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf
set JAVA_ARGS=-Dorg.apache.nifi.registry.bootstrap.config.file=%BOOTSTRAP_CONF_FILE%
-SET JAVA_PARAMS=-cp %CONF_DIR%;%LIB_DIR%\* -Xms512m -Xmx1024m %JAVA_ARGS% org.apache.nifi.registry.NiFiRegistry
+SET JAVA_PARAMS=-cp %CONF_DIR%;%LIB_DIR%\*;%SHARED_DIR%\*;%BOOTSTRAP_DIR%\* -Xms512m -Xmx1024m %JAVA_ARGS% org.apache.nifi.registry.NiFiRegistry
set BOOTSTRAP_ACTION=run
echo cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %BOOTSTRAP_ACTION%
diff --git a/nifi-registry-resources/src/main/resources/bin/status-nifi-registry.bat b/nifi-registry-resources/src/main/resources/bin/status-nifi-registry.bat
index 0e9155a..30a29a0 100644
--- a/nifi-registry-resources/src/main/resources/bin/status-nifi-registry.bat
+++ b/nifi-registry-resources/src/main/resources/bin/status-nifi-registry.bat
@@ -33,15 +33,17 @@
:startNiFiRegistry
set NIFI_REGISTRY_ROOT=%~dp0..\
pushd "%NIFI_REGISTRY_ROOT%"
-set LIB_DIR=lib\bootstrap
+set LIB_DIR=%NIFI_REGISTRY_ROOT%\lib
+set SHARED_DIR=%NIFI_REGISTRY_ROOT%\lib\shared
+set BOOTSTRAP_DIR=%NIFI_REGISTRY_ROOT%\lib\bootstrap
set CONF_DIR=conf
set BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf
set JAVA_ARGS=-Dorg.apache.nifi.registry.bootstrap.config.file=%BOOTSTRAP_CONF_FILE%
-set JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.registry.NiFiRegistry
+set JAVA_PARAMS=-cp %LIB_DIR%\*;%SHARED_DIR%\*;%BOOTSTRAP_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.registry.NiFiRegistry
set BOOTSTRAP_ACTION=status
cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %BOOTSTRAP_ACTION%
-popd
\ No newline at end of file
+popd
