Repository: nifi-registry Updated Branches: refs/heads/master c01f79a29 -> e8c6497f3
NIFIREG-140: Fix classpath for Windows This closes #114. Signed-off-by: Bryan Bende <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi-registry/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-registry/commit/e8c6497f Tree: http://git-wip-us.apache.org/repos/asf/nifi-registry/tree/e8c6497f Diff: http://git-wip-us.apache.org/repos/asf/nifi-registry/diff/e8c6497f Branch: refs/heads/master Commit: e8c6497f3f8ba82bf27f5d61198b86bda8530616 Parents: c01f79a Author: valerybonnet <[email protected]> Authored: Tue Apr 24 11:06:36 2018 +0200 Committer: Bryan Bende <[email protected]> Committed: Tue May 8 12:36:01 2018 -0400 ---------------------------------------------------------------------- .../src/main/resources/bin/dump-nifi-registry.bat | 6 ++++-- .../src/main/resources/bin/run-nifi-registry.bat | 4 +++- .../src/main/resources/bin/status-nifi-registry.bat | 8 +++++--- 3 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/e8c6497f/nifi-registry-resources/src/main/resources/bin/dump-nifi-registry.bat ---------------------------------------------------------------------- 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 @@ goto startNiFiRegistry :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% http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/e8c6497f/nifi-registry-resources/src/main/resources/bin/run-nifi-registry.bat ---------------------------------------------------------------------- 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 @@ goto startNiFiRegistry 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% http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/e8c6497f/nifi-registry-resources/src/main/resources/bin/status-nifi-registry.bat ---------------------------------------------------------------------- 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 @@ goto startNiFiRegistry :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
