Merge branch 'ms-batch' of https://github.com/BELUGABEHR/incubator-nifi into develop

This commit is contained in:
Mark Payne 2015-06-07 15:02:01 -04:00
commit ceda66159e
5 changed files with 235 additions and 165 deletions

View File

@ -1,33 +1,47 @@
@echo off @echo off
rem rem
rem Licensed to the Apache Software Foundation (ASF) under one or more rem Licensed to the Apache Software Foundation (ASF) under one or more
rem contributor license agreements. See the NOTICE file distributed with rem contributor license agreements. See the NOTICE file distributed with
rem this work for additional information regarding copyright ownership. 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 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 not use this file except in compliance with
rem the License. You may obtain a copy of the License at rem the License. You may obtain a copy of the License at
rem rem
rem http://www.apache.org/licenses/LICENSE-2.0 rem http://www.apache.org/licenses/LICENSE-2.0
rem rem
rem Unless required by applicable law or agreed to in writing, software 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 distributed under the License is distributed on an "AS IS" BASIS,
rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
rem See the License for the specific language governing permissions and rem See the License for the specific language governing permissions and
rem limitations under the License. rem limitations under the License.
rem rem
rem Use JAVA_HOME if it's set; otherwise, just use java 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)
if "%JAVA_HOME%" == "" goto noJavaHome
SET NIFI_ROOT=%~dp0..\ if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
CD /d "%NIFI_ROOT%" set JAVA_EXE=%JAVA_HOME%\bin\java.exe
SET LIB_DIR=lib\bootstrap goto startNifi
SET CONF_DIR=conf
:noJavaHome
SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf echo The JAVA_HOME environment variable is not defined correctly.
SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE% echo Instead the PATH will be used to find the java executable.
echo.
SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.bootstrap.RunNiFi set JAVA_EXE=java
SET BOOTSTRAP_ACTION=dump goto startNifi
cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %BOOTSTRAP_ACTION% :startNifi
set NIFI_ROOT=%~dp0..\
pushd "%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%
popd

View File

@ -1,33 +1,47 @@
@echo off @echo off
rem rem
rem Licensed to the Apache Software Foundation (ASF) under one or more rem Licensed to the Apache Software Foundation (ASF) under one or more
rem contributor license agreements. See the NOTICE file distributed with rem contributor license agreements. See the NOTICE file distributed with
rem this work for additional information regarding copyright ownership. 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 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 not use this file except in compliance with
rem the License. You may obtain a copy of the License at rem the License. You may obtain a copy of the License at
rem rem
rem http://www.apache.org/licenses/LICENSE-2.0 rem http://www.apache.org/licenses/LICENSE-2.0
rem rem
rem Unless required by applicable law or agreed to in writing, software 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 distributed under the License is distributed on an "AS IS" BASIS,
rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
rem See the License for the specific language governing permissions and rem See the License for the specific language governing permissions and
rem limitations under the License. rem limitations under the License.
rem rem
rem Use JAVA_HOME if it's set; otherwise, just use java 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)
if "%JAVA_HOME%" == "" goto noJavaHome
SET NIFI_ROOT=%~dp0..\ if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
CD /d "%NIFI_ROOT%" set JAVA_EXE=%JAVA_HOME%\bin\java.exe
SET LIB_DIR=lib\bootstrap goto startNifi
SET CONF_DIR=conf
:noJavaHome
SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf echo The JAVA_HOME environment variable is not defined correctly.
SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE% echo Instead the PATH will be used to find the java executable.
echo.
SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.bootstrap.RunNiFi set JAVA_EXE=java
SET BOOTSTRAP_ACTION=run goto startNifi
cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %BOOTSTRAP_ACTION% :startNifi
set NIFI_ROOT=%~dp0..\
pushd "%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%
popd

View File

@ -1,33 +1,47 @@
@echo off @echo off
rem rem
rem Licensed to the Apache Software Foundation (ASF) under one or more rem Licensed to the Apache Software Foundation (ASF) under one or more
rem contributor license agreements. See the NOTICE file distributed with rem contributor license agreements. See the NOTICE file distributed with
rem this work for additional information regarding copyright ownership. 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 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 not use this file except in compliance with
rem the License. You may obtain a copy of the License at rem the License. You may obtain a copy of the License at
rem rem
rem http://www.apache.org/licenses/LICENSE-2.0 rem http://www.apache.org/licenses/LICENSE-2.0
rem rem
rem Unless required by applicable law or agreed to in writing, software 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 distributed under the License is distributed on an "AS IS" BASIS,
rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
rem See the License for the specific language governing permissions and rem See the License for the specific language governing permissions and
rem limitations under the License. rem limitations under the License.
rem rem
rem Use JAVA_HOME if it's set; otherwise, just use java 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)
if "%JAVA_HOME%" == "" goto noJavaHome
SET NIFI_ROOT=%~dp0..\ if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
CD /d "%NIFI_ROOT%" set JAVA_EXE=%JAVA_HOME%\bin\java.exe
SET LIB_DIR=lib\bootstrap goto startNifi
SET CONF_DIR=conf
:noJavaHome
SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf echo The JAVA_HOME environment variable is not defined correctly.
SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE% echo Instead the PATH will be used to find the java executable.
echo.
SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.bootstrap.RunNiFi set JAVA_EXE=java
SET BOOTSTRAP_ACTION=start goto startNifi
cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %BOOTSTRAP_ACTION% :startNifi
set NIFI_ROOT=%~dp0..\
pushd "%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%
popd

View File

@ -1,33 +1,47 @@
@echo off @echo off
rem rem
rem Licensed to the Apache Software Foundation (ASF) under one or more rem Licensed to the Apache Software Foundation (ASF) under one or more
rem contributor license agreements. See the NOTICE file distributed with rem contributor license agreements. See the NOTICE file distributed with
rem this work for additional information regarding copyright ownership. 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 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 not use this file except in compliance with
rem the License. You may obtain a copy of the License at rem the License. You may obtain a copy of the License at
rem rem
rem http://www.apache.org/licenses/LICENSE-2.0 rem http://www.apache.org/licenses/LICENSE-2.0
rem rem
rem Unless required by applicable law or agreed to in writing, software 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 distributed under the License is distributed on an "AS IS" BASIS,
rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
rem See the License for the specific language governing permissions and rem See the License for the specific language governing permissions and
rem limitations under the License. rem limitations under the License.
rem rem
rem Use JAVA_HOME if it's set; otherwise, just use java 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)
if "%JAVA_HOME%" == "" goto noJavaHome
SET NIFI_ROOT=%~dp0..\ if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
CD /d "%NIFI_ROOT%" set JAVA_EXE=%JAVA_HOME%\bin\java.exe
SET LIB_DIR=lib\bootstrap goto startNifi
SET CONF_DIR=conf
:noJavaHome
SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf echo The JAVA_HOME environment variable is not defined correctly.
SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE% echo Instead the PATH will be used to find the java executable.
echo.
SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.bootstrap.RunNiFi set JAVA_EXE=java
SET BOOTSTRAP_ACTION=status goto startNifi
cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %BOOTSTRAP_ACTION% :startNifi
set NIFI_ROOT=%~dp0..\
pushd "%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%
popd

View File

@ -1,33 +1,47 @@
@echo off @echo off
rem rem
rem Licensed to the Apache Software Foundation (ASF) under one or more rem Licensed to the Apache Software Foundation (ASF) under one or more
rem contributor license agreements. See the NOTICE file distributed with rem contributor license agreements. See the NOTICE file distributed with
rem this work for additional information regarding copyright ownership. 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 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 not use this file except in compliance with
rem the License. You may obtain a copy of the License at rem the License. You may obtain a copy of the License at
rem rem
rem http://www.apache.org/licenses/LICENSE-2.0 rem http://www.apache.org/licenses/LICENSE-2.0
rem rem
rem Unless required by applicable law or agreed to in writing, software 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 distributed under the License is distributed on an "AS IS" BASIS,
rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
rem See the License for the specific language governing permissions and rem See the License for the specific language governing permissions and
rem limitations under the License. rem limitations under the License.
rem rem
rem Use JAVA_HOME if it's set; otherwise, just use java 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)
if "%JAVA_HOME%" == "" goto noJavaHome
SET NIFI_ROOT=%~dp0..\ if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
CD /d "%NIFI_ROOT%" set JAVA_EXE=%JAVA_HOME%\bin\java.exe
SET LIB_DIR=lib\bootstrap goto startNifi
SET CONF_DIR=conf
:noJavaHome
SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf echo The JAVA_HOME environment variable is not defined correctly.
SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE% echo Instead the PATH will be used to find the java executable.
echo.
SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.bootstrap.RunNiFi set JAVA_EXE=java
SET BOOTSTRAP_ACTION=stop goto startNifi
cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %BOOTSTRAP_ACTION% :startNifi
set NIFI_ROOT=%~dp0..\
pushd "%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%
popd