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 2015/01/25 14:25:20 UTC
incubator-nifi git commit: NIFI-282: removed generated files that
were accidentally checked in
Repository: incubator-nifi
Updated Branches:
refs/heads/site-to-site-client 263417a31 -> fa6430496
NIFI-282: removed generated files that were accidentally checked in
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/fa643049
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/fa643049
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/fa643049
Branch: refs/heads/site-to-site-client
Commit: fa6430496da4b2c44ad149a5bd3758d04f068529
Parents: 263417a
Author: Mark Payne <ma...@hotmail.com>
Authored: Sun Jan 25 08:25:15 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Sun Jan 25 08:25:15 2015 -0500
----------------------------------------------------------------------
.../src/main/resources/bin/dump-nifi.bat | 33 ----
.../src/main/resources/bin/nifi-status.bat | 33 ----
.../resources/src/main/resources/bin/nifi.sh | 181 -------------------
.../src/main/resources/bin/run-nifi.bat | 33 ----
.../src/main/resources/bin/start-nifi.bat | 33 ----
.../src/main/resources/bin/stop-nifi.bat | 33 ----
6 files changed, 346 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa643049/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/dump-nifi.bat
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/dump-nifi.bat b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/dump-nifi.bat
deleted file mode 100644
index 71e5a1a..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/dump-nifi.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@echo off
-rem
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-rem
-
-rem Use JAVA_HOME if it's set; otherwise, just use java
-IF "%JAVA_HOME%"=="" (SET JAVA_EXE=java) ELSE (SET JAVA_EXE=%JAVA_HOME%\bin\java.exe)
-
-SET NIFI_ROOT=%~dp0..\
-CD /d "%NIFI_ROOT%"
-SET LIB_DIR=lib\bootstrap
-SET CONF_DIR=conf
-
-SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf
-SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE%
-
-SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.bootstrap.RunNiFi
-SET BOOTSTRAP_ACTION=dump
-
-cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %BOOTSTRAP_ACTION%
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa643049/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat
deleted file mode 100644
index 07dd6c7..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@echo off
-rem
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-rem
-
-rem Use JAVA_HOME if it's set; otherwise, just use java
-IF "%JAVA_HOME%"=="" (SET JAVA_EXE=java) ELSE (SET JAVA_EXE=%JAVA_HOME%\bin\java.exe)
-
-SET NIFI_ROOT=%~dp0..\
-CD /d "%NIFI_ROOT%"
-SET LIB_DIR=lib\bootstrap
-SET CONF_DIR=conf
-
-SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf
-SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE%
-
-SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.bootstrap.RunNiFi
-SET BOOTSTRAP_ACTION=status
-
-cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %BOOTSTRAP_ACTION%
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa643049/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi.sh
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi.sh b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi.sh
deleted file mode 100644
index fb0d22e..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi.sh
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# chkconfig: 2345 20 80
-# description: Apache NiFi is a dataflow system based on the principles of Flow-Based Programming.
-#
-
-# Script structure inspired from Apache Karaf and other Apache projects with similar startup approaches
-
-NIFI_HOME=`cd $(dirname "$0") && cd .. && pwd`
-PROGNAME=`basename "$0"`
-
-
-warn() {
- echo "${PROGNAME}: $*"
-}
-
-die() {
- warn "$*"
- exit 1
-}
-
-detectOS() {
- # OS specific support (must be 'true' or 'false').
- cygwin=false;
- aix=false;
- os400=false;
- darwin=false;
- case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
- AIX*)
- aix=true
- ;;
- OS400*)
- os400=true
- ;;
- Darwin)
- darwin=true
- ;;
- esac
- # For AIX, set an environment variable
- if $aix; then
- export LDR_CNTRL=MAXDATA=0xB0000000@DSA
- echo $LDR_CNTRL
- fi
-}
-
-unlimitFD() {
- # Use the maximum available, or set MAX_FD != -1 to use that
- if [ "x$MAX_FD" = "x" ]; then
- MAX_FD="maximum"
- fi
-
- # Increase the maximum file descriptors if we can
- if [ "$os400" = "false" ] && [ "$cygwin" = "false" ]; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ "$MAX_FD_LIMIT" != 'unlimited' ]; then
- if [ $? -eq 0 ]; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
- # use the system max
- MAX_FD="$MAX_FD_LIMIT"
- fi
-
- ulimit -n $MAX_FD > /dev/null
- # echo "ulimit -n" `ulimit -n`
- if [ $? -ne 0 ]; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
- fi
- fi
-}
-
-
-
-locateJava() {
- # Setup the Java Virtual Machine
- if $cygwin ; then
- [ -n "$JAVA" ] && JAVA=`cygpath --unix "$JAVA"`
- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
- fi
-
- if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then
- JAVA_HOME=`java-config --jre-home`
- fi
- if [ "x$JAVA" = "x" ]; then
- if [ "x$JAVA_HOME" != "x" ]; then
- if [ ! -d "$JAVA_HOME" ]; then
- die "JAVA_HOME is not valid: $JAVA_HOME"
- fi
- JAVA="$JAVA_HOME/bin/java"
- else
- warn "JAVA_HOME not set; results may vary"
- JAVA=`type java`
- JAVA=`expr "$JAVA" : '.* \(/.*\)$'`
- if [ "x$JAVA" = "x" ]; then
- die "java command not found"
- fi
- fi
- fi
-}
-
-init() {
- # Determine if there is special OS handling we must perform
- detectOS
-
- # Unlimit the number of file descriptors if possible
- unlimitFD
-
- # Locate the Java VM to execute
- locateJava
-}
-
-
-install() {
- SVC_NAME=nifi
- if [ "x$2" != "x" ] ; then
- SVC_NAME=$2
- fi
-
- SVC_FILE=/etc/init.d/$SVC_NAME
- cp $0 $SVC_FILE
- sed -i s:NIFI_HOME=.*:NIFI_HOME="$NIFI_HOME": $SVC_FILE
- sed -i s:PROGNAME=.*:PROGNAME=$(basename "$0"): $SVC_FILE
- echo Service $SVC_NAME installed
-}
-
-
-run() {
- BOOTSTRAP_CONF="$NIFI_HOME/conf/bootstrap.conf";
-
- if $cygwin; then
- NIFI_HOME=`cygpath --path --windows "$NIFI_HOME"`
- BOOTSTRAP_CONF=`cygpath --path --windows "$BOOTSTRAP_CONF"`
- fi
-
- echo
- echo "Java home: $JAVA_HOME"
- echo "NiFi home: $NIFI_HOME"
- echo
- echo "Bootstrap Config File: $BOOTSTRAP_CONF"
- echo
-
- exec "$JAVA" -cp "$NIFI_HOME"/lib/bootstrap/* -Xms12m -Xmx24m -Dorg.apache.nifi.bootstrap.config.file="$BOOTSTRAP_CONF" org.apache.nifi.bootstrap.RunNiFi $@
-}
-
-main() {
- init
- run "$@"
-}
-
-
-case "$1" in
- install)
- install "$@"
- ;;
- start|stop|run|restart|status|dump)
- main "$@"
- ;;
- *)
- echo "Usage nifi {start|stop|run|restart|status|dump|install}"
- ;;
-esac
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa643049/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat
deleted file mode 100644
index 03123d6..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@echo off
-rem
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-rem
-
-rem Use JAVA_HOME if it's set; otherwise, just use java
-IF "%JAVA_HOME%"=="" (SET JAVA_EXE=java) ELSE (SET JAVA_EXE=%JAVA_HOME%\bin\java.exe)
-
-SET NIFI_ROOT=%~dp0..\
-CD /d "%NIFI_ROOT%"
-SET LIB_DIR=lib\bootstrap
-SET CONF_DIR=conf
-
-SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf
-SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE%
-
-SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.bootstrap.RunNiFi
-SET BOOTSTRAP_ACTION=run
-
-cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %BOOTSTRAP_ACTION%
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa643049/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat
deleted file mode 100644
index 6cc8733..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@echo off
-rem
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-rem
-
-rem Use JAVA_HOME if it's set; otherwise, just use java
-IF "%JAVA_HOME%"=="" (SET JAVA_EXE=java) ELSE (SET JAVA_EXE=%JAVA_HOME%\bin\java.exe)
-
-SET NIFI_ROOT=%~dp0..\
-CD /d "%NIFI_ROOT%"
-SET LIB_DIR=lib\bootstrap
-SET CONF_DIR=conf
-
-SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf
-SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE%
-
-SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.bootstrap.RunNiFi
-SET BOOTSTRAP_ACTION=start
-
-cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %BOOTSTRAP_ACTION%
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa643049/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat
deleted file mode 100644
index e4fc81d..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@echo off
-rem
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-rem
-
-rem Use JAVA_HOME if it's set; otherwise, just use java
-IF "%JAVA_HOME%"=="" (SET JAVA_EXE=java) ELSE (SET JAVA_EXE=%JAVA_HOME%\bin\java.exe)
-
-SET NIFI_ROOT=%~dp0..\
-CD /d "%NIFI_ROOT%"
-SET LIB_DIR=lib\bootstrap
-SET CONF_DIR=conf
-
-SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf
-SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE%
-
-SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.bootstrap.RunNiFi
-SET BOOTSTRAP_ACTION=stop
-
-cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %BOOTSTRAP_ACTION%