You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2014/12/10 17:09:23 UTC
[9/9] incubator-nifi git commit: Merge branch 'bootstrap' into develop
Merge branch 'bootstrap' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/cce36335
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/cce36335
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/cce36335
Branch: refs/heads/develop
Commit: cce36335e1d22a6664d907c55e617d8807bcee90
Parents: 5ebf3b5 192d782
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Dec 10 11:08:55 2014 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Dec 10 11:08:55 2014 -0500
----------------------------------------------------------------------
assemblies/nifi/pom.xml | 5 +
.../apache/nifi/controller/FlowController.java | 15 +
.../repository/FileSystemRepository.java | 4 +-
.../WriteAheadFlowFileRepository.java | 7 +-
.../scheduling/StandardProcessScheduler.java | 3 +
.../java/org/apache/nifi/engine/FlowEngine.java | 15 +
.../src/main/resources/bin/nifi-status.bat | 32 ++
.../resources/src/main/resources/bin/nifi.sh | 193 +---------
.../src/main/resources/bin/run-nifi.bat | 32 ++
.../src/main/resources/bin/start-nifi.bat | 32 ++
.../src/main/resources/bin/stop-nifi.bat | 32 ++
.../src/main/resources/conf/bootstrap.conf | 16 +
.../java/org/apache/nifi/BootstrapListener.java | 234 ++++++++++++
.../src/main/java/org/apache/nifi/NiFi.java | 40 +-
nifi-bootstrap/pom.xml | 17 +-
.../apache/nifi/bootstrap/BootstrapCodec.java | 89 +++++
.../org/apache/nifi/bootstrap/NiFiListener.java | 116 ++++++
.../java/org/apache/nifi/bootstrap/RunNiFi.java | 370 +++++++++++++++++--
.../org/apache/nifi/bootstrap/ShutdownHook.java | 69 +++-
.../exception/InvalidCommandException.java | 37 ++
20 files changed, 1136 insertions(+), 222 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cce36335/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi.sh
----------------------------------------------------------------------
diff --cc nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi.sh
index 6fedfb7,81ae384..ad90d5b
--- a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi.sh
+++ b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi.sh
@@@ -21,40 -21,7 +21,12 @@@
DIRNAME=`dirname "$0"`
PROGNAME=`basename "$0"`
- #
- # Sourcing environment settings for NIFI similar to tomcats setenv
- #
- NIFI_SCRIPT="nifi.sh"
- export NIFI_SCRIPT
- if [ -f "$DIRNAME/setenv.sh" ]; then
- . "$DIRNAME/setenv.sh"
- fi
-
- #
- # Check/Set up some easily accessible MIN/MAX params for JVM mem usage
- #
- if [ "x$JAVA_MIN_MEM" = "x" ]; then
- JAVA_MIN_MEM=512M
- export JAVA_MIN_MEM
- fi
- if [ "x$JAVA_MAX_MEM" = "x" ]; then
- JAVA_MAX_MEM=512M
- export JAVA_MAX_MEM
- fi
- if [ "x$JAVA_PERMSIZE" = "x" ]; then
- JAVA_PERMSIZE=128M
- export JAVA_PERMSIZE
- fi
- if [ "x$JAVA_MAX_PERMSIZE" = "x" ]; then
- JAVA_MAX_PERMSIZE=128M
- export JAVA_MAX_PERMSIZE
- fi
+#
+#Readlink is not available on all systems. Change variable to appropriate alternative as part of OS detection
+#
+
+READLINK="readlink"
warn() {
echo "${PROGNAME}: $*"