You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ij...@apache.org on 2017/09/27 23:31:39 UTC
[1/2] nifi git commit: NIFI-4363 Replaced hardcoded heap size options
with JAVA_ARGS environment variable.
Repository: nifi
Updated Branches:
refs/heads/master 6c798d18e -> 9ff7d1560
NIFI-4363 Replaced hardcoded heap size options with JAVA_ARGS environment variable.
This closes #2136.
Signed-off-by: Koji Kawamura <ij...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/d2710310
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/d2710310
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/d2710310
Branch: refs/heads/master
Commit: d27103100db253824a82fbdecc5836607d07fff3
Parents: 6c798d1
Author: Jeff Storck <jt...@gmail.com>
Authored: Fri Sep 8 17:33:00 2017 -0400
Committer: Koji Kawamura <ij...@apache.org>
Committed: Thu Sep 28 08:30:47 2017 +0900
----------------------------------------------------------------------
.../src/main/resources/bin/encrypt-config.bat | 4 +++-
.../src/main/resources/bin/encrypt-config.sh | 2 +-
.../src/main/resources/bin/file-manager.bat | 4 +++-
.../nifi-toolkit-assembly/src/main/resources/bin/file-manager.sh | 2 +-
.../src/main/resources/bin/flow-analyzer.bat | 4 +++-
.../src/main/resources/bin/flow-analyzer.sh | 2 +-
.../src/main/resources/bin/node-manager.bat | 4 +++-
.../nifi-toolkit-assembly/src/main/resources/bin/node-manager.sh | 2 +-
.../nifi-toolkit-assembly/src/main/resources/bin/notify.bat | 4 +++-
.../nifi-toolkit-assembly/src/main/resources/bin/notify.sh | 2 +-
.../nifi-toolkit-assembly/src/main/resources/bin/s2s.bat | 4 +++-
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh | 2 +-
.../nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat | 4 +++-
.../nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh | 2 +-
.../nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat | 4 +++-
.../nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh | 2 +-
16 files changed, 32 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/d2710310/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.bat
index f0b0e9c..a0f7458 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.bat
@@ -33,7 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
-SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms128m -Xmx256m org.apache.nifi.properties.ConfigEncryptionTool
+if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms128m -Xmx256m
+
+SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.properties.ConfigEncryptionTool
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
http://git-wip-us.apache.org/repos/asf/nifi/blob/d2710310/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.sh
index f85a20c..8e6b59e 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.sh
@@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
- "${JAVA}" -cp "${CLASSPATH}" -Xms128m -Xmx256m org.apache.nifi.properties.ConfigEncryptionTool "$@"
+ "${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms128m -Xmx256m} org.apache.nifi.properties.ConfigEncryptionTool "$@"
return $?
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/d2710310/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.bat
index 001d0cd..8cda347 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.bat
@@ -33,7 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
-SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.toolkit.admin.filemanager.FileManagerTool
+if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
+
+SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.admin.filemanager.FileManagerTool
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
http://git-wip-us.apache.org/repos/asf/nifi/blob/d2710310/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.sh
index 91f1664..0f3f44e 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.sh
@@ -110,7 +110,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
- "${JAVA}" -cp "${CLASSPATH}" -Xms12m -Xmx24m org.apache.nifi.toolkit.admin.filemanager.FileManagerTool "$@"
+ "${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.admin.filemanager.FileManagerTool "$@"
return $?
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/d2710310/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.bat
index 4c7e738..9896b1e 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.bat
@@ -33,7 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
-SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.toolkit.flowanalyzer.FlowAnalyzerDriver
+if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
+
+SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.flowanalyzer.FlowAnalyzerDriver
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
http://git-wip-us.apache.org/repos/asf/nifi/blob/d2710310/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.sh
index 1ef1842..2e554b0 100755
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.sh
@@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
- "${JAVA}" -cp "${CLASSPATH}" -Xms12m -Xmx24m org.apache.nifi.toolkit.flowanalyzer.FlowAnalyzerDriver "$@"
+ "${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.flowanalyzer.FlowAnalyzerDriver "$@"
return $?
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/d2710310/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.bat
index 4c94ce5..2649406 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.bat
@@ -33,7 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~sdp0..\classpath;%~sdp0..\lib
-SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.toolkit.admin.nodemanager.NodeManagerTool
+Sif "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
+
+ET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.admin.nodemanager.NodeManagerTool
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
http://git-wip-us.apache.org/repos/asf/nifi/blob/d2710310/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.sh
index c80d966..4fef271 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.sh
@@ -110,7 +110,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
- "${JAVA}" -cp "${CLASSPATH}" -Xms12m -Xmx24m org.apache.nifi.toolkit.admin.nodemanager.NodeManagerTool "$@"
+ "${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.admin.nodemanager.NodeManagerTool "$@"
return $?
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/d2710310/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.bat
index 191519f..7bb8195 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.bat
@@ -33,7 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~sdp0..\classpath;%~sdp0..\lib
-SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.toolkit.admin.notify.NotificationTool
+if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
+
+SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.admin.notify.NotificationTool
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
http://git-wip-us.apache.org/repos/asf/nifi/blob/d2710310/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.sh
index 746c78a..323f835 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.sh
@@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
- "${JAVA}" -cp "${CLASSPATH}" -Xms12m -Xmx24m org.apache.nifi.toolkit.admin.notify.NotificationTool "$@"
+ "${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.admin.notify.NotificationTool "$@"
return $?
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/d2710310/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat
index 54223c7..5f0222a 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat
@@ -33,7 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
-SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms128m -Xmx256m %JAVA_ARGS% org.apache.nifi.toolkit.s2s.SiteToSiteCliMain
+if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms128m -Xmx256m
+
+SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.s2s.SiteToSiteCliMain
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
http://git-wip-us.apache.org/repos/asf/nifi/blob/d2710310/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh
index f84e04b..e23570a 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh
@@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
- "${JAVA}" -cp "${CLASSPATH}" -Xms128m -Xmx256m org.apache.nifi.toolkit.s2s.SiteToSiteCliMain "$@"
+ "${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms128m -Xmx256m} org.apache.nifi.toolkit.s2s.SiteToSiteCliMain "$@"
return $?
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/d2710310/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat
index 2188a1b..0a96c1d 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat
@@ -33,7 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
-SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.toolkit.tls.TlsToolkitMain
+if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
+
+SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.tls.TlsToolkitMain
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
http://git-wip-us.apache.org/repos/asf/nifi/blob/d2710310/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh
index 619c8ab..3ffbd5b 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh
@@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
- "${JAVA}" -cp "${CLASSPATH}" -Xms12m -Xmx24m org.apache.nifi.toolkit.tls.TlsToolkitMain "$@"
+ "${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.tls.TlsToolkitMain "$@"
return $?
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/d2710310/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat
index 481f00b..2b28b6f 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat
@@ -33,7 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
-SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.toolkit.zkmigrator.ZooKeeperMigratorMain
+if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
+
+SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.zkmigrator.ZooKeeperMigratorMain
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
http://git-wip-us.apache.org/repos/asf/nifi/blob/d2710310/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh
index 9b935fc..a15f541 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh
@@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
- "${JAVA}" -cp "${CLASSPATH}" -Xms12m -Xmx24m org.apache.nifi.toolkit.zkmigrator.ZooKeeperMigratorMain "$@"
+ "${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.zkmigrator.ZooKeeperMigratorMain "$@"
return $?
}
[2/2] nifi git commit: NIFI-4363 Rename JAVA_ARGS to JAVA_OPTS
Posted by ij...@apache.org.
NIFI-4363 Rename JAVA_ARGS to JAVA_OPTS
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9ff7d156
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9ff7d156
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9ff7d156
Branch: refs/heads/master
Commit: 9ff7d15603a339c65ecc4319d87ac75f8d6e4526
Parents: d271031
Author: Koji Kawamura <ij...@apache.org>
Authored: Fri Sep 15 12:23:11 2017 +0900
Committer: Koji Kawamura <ij...@apache.org>
Committed: Thu Sep 28 08:31:13 2017 +0900
----------------------------------------------------------------------
.../src/main/resources/bin/encrypt-config.bat | 4 ++--
.../src/main/resources/bin/encrypt-config.sh | 2 +-
.../src/main/resources/bin/file-manager.bat | 4 ++--
.../nifi-toolkit-assembly/src/main/resources/bin/file-manager.sh | 4 ++--
.../src/main/resources/bin/flow-analyzer.bat | 4 ++--
.../src/main/resources/bin/flow-analyzer.sh | 2 +-
.../src/main/resources/bin/node-manager.bat | 4 ++--
.../nifi-toolkit-assembly/src/main/resources/bin/node-manager.sh | 4 ++--
.../nifi-toolkit-assembly/src/main/resources/bin/notify.bat | 4 ++--
.../nifi-toolkit-assembly/src/main/resources/bin/notify.sh | 4 ++--
.../nifi-toolkit-assembly/src/main/resources/bin/s2s.bat | 4 ++--
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh | 2 +-
.../nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat | 4 ++--
.../nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh | 2 +-
.../nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat | 4 ++--
.../nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh | 2 +-
16 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ff7d156/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.bat
index a0f7458..29e42e6 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.bat
@@ -33,9 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
-if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms128m -Xmx256m
+if "%JAVA_OPTS%" == "" set JAVA_OPTS=-Xms128m -Xmx256m
-SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.properties.ConfigEncryptionTool
+SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_OPTS% org.apache.nifi.properties.ConfigEncryptionTool
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ff7d156/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.sh
index 8e6b59e..4acaab6 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.sh
@@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
- "${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms128m -Xmx256m} org.apache.nifi.properties.ConfigEncryptionTool "$@"
+ "${JAVA}" -cp "${CLASSPATH}" ${JAVA_OPTS:--Xms128m -Xmx256m} org.apache.nifi.properties.ConfigEncryptionTool "$@"
return $?
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ff7d156/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.bat
index 8cda347..b500861 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.bat
@@ -33,9 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
-if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
+if "%JAVA_OPTS%" == "" set JAVA_OPTS=-Xms12m -Xmx24m
-SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.admin.filemanager.FileManagerTool
+SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_OPTS% org.apache.nifi.toolkit.admin.filemanager.FileManagerTool
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ff7d156/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.sh
index 0f3f44e..de7bfdc 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.sh
@@ -110,10 +110,10 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
- "${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.admin.filemanager.FileManagerTool "$@"
+ "${JAVA}" -cp "${CLASSPATH}" ${JAVA_OPTS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.admin.filemanager.FileManagerTool "$@"
return $?
}
init "$1"
-run "$@"
\ No newline at end of file
+run "$@"
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ff7d156/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.bat
index 9896b1e..0a4d834 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.bat
@@ -33,9 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
-if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
+if "%JAVA_OPTS%" == "" set JAVA_OPTS=-Xms12m -Xmx24m
-SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.flowanalyzer.FlowAnalyzerDriver
+SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_OPTS% org.apache.nifi.toolkit.flowanalyzer.FlowAnalyzerDriver
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ff7d156/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.sh
index 2e554b0..5c23b55 100755
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.sh
@@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
- "${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.flowanalyzer.FlowAnalyzerDriver "$@"
+ "${JAVA}" -cp "${CLASSPATH}" ${JAVA_OPTS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.flowanalyzer.FlowAnalyzerDriver "$@"
return $?
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ff7d156/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.bat
index 2649406..4a244d1 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.bat
@@ -33,9 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~sdp0..\classpath;%~sdp0..\lib
-Sif "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
+Sif "%JAVA_OPTS%" == "" set JAVA_OPTS=-Xms12m -Xmx24m
-ET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.admin.nodemanager.NodeManagerTool
+ET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_OPTS% org.apache.nifi.toolkit.admin.nodemanager.NodeManagerTool
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ff7d156/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.sh
index 4fef271..dcc981b 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.sh
@@ -110,10 +110,10 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
- "${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.admin.nodemanager.NodeManagerTool "$@"
+ "${JAVA}" -cp "${CLASSPATH}" ${JAVA_OPTS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.admin.nodemanager.NodeManagerTool "$@"
return $?
}
init "$1"
-run "$@"
\ No newline at end of file
+run "$@"
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ff7d156/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.bat
index 7bb8195..1e27999 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.bat
@@ -33,9 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~sdp0..\classpath;%~sdp0..\lib
-if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
+if "%JAVA_OPTS%" == "" set JAVA_OPTS=-Xms12m -Xmx24m
-SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.admin.notify.NotificationTool
+SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_OPTS% org.apache.nifi.toolkit.admin.notify.NotificationTool
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ff7d156/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.sh
index 323f835..87f8706 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.sh
@@ -111,10 +111,10 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
- "${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.admin.notify.NotificationTool "$@"
+ "${JAVA}" -cp "${CLASSPATH}" ${JAVA_OPTS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.admin.notify.NotificationTool "$@"
return $?
}
init "$1"
-run "$@"
\ No newline at end of file
+run "$@"
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ff7d156/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat
index 5f0222a..ce27b85 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat
@@ -33,9 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
-if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms128m -Xmx256m
+if "%JAVA_OPTS%" == "" set JAVA_OPTS=-Xms128m -Xmx256m
-SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.s2s.SiteToSiteCliMain
+SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_OPTS% org.apache.nifi.toolkit.s2s.SiteToSiteCliMain
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ff7d156/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh
index e23570a..887dd12 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh
@@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
- "${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms128m -Xmx256m} org.apache.nifi.toolkit.s2s.SiteToSiteCliMain "$@"
+ "${JAVA}" -cp "${CLASSPATH}" ${JAVA_OPTS:--Xms128m -Xmx256m} org.apache.nifi.toolkit.s2s.SiteToSiteCliMain "$@"
return $?
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ff7d156/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat
index 0a96c1d..652db5e 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat
@@ -33,9 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
-if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
+if "%JAVA_OPTS%" == "" set JAVA_OPTS=-Xms12m -Xmx24m
-SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.tls.TlsToolkitMain
+SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_OPTS% org.apache.nifi.toolkit.tls.TlsToolkitMain
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ff7d156/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh
index 3ffbd5b..e2452dd 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh
@@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
- "${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.tls.TlsToolkitMain "$@"
+ "${JAVA}" -cp "${CLASSPATH}" ${JAVA_OPTS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.tls.TlsToolkitMain "$@"
return $?
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ff7d156/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat
index 2b28b6f..5801720 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat
@@ -33,9 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
-if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
+if "%JAVA_OPTS%" == "" set JAVA_OPTS=-Xms12m -Xmx24m
-SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.zkmigrator.ZooKeeperMigratorMain
+SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_OPTS% org.apache.nifi.toolkit.zkmigrator.ZooKeeperMigratorMain
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ff7d156/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh
index a15f541..b593d69 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh
@@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
- "${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.zkmigrator.ZooKeeperMigratorMain "$@"
+ "${JAVA}" -cp "${CLASSPATH}" ${JAVA_OPTS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.zkmigrator.ZooKeeperMigratorMain "$@"
return $?
}