Repository: incubator-nifi Updated Branches: refs/heads/develop fe2a33182 -> d89ba7392
NIFI-145: Moved bootstrap jar into its own directory: lib/bootstrap Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/82e42fad Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/82e42fad Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/82e42fad Branch: refs/heads/develop Commit: 82e42fad03d706092406e2f62c963da8cbffe1ba Parents: cb2e855 Author: Mark Payne <[email protected]> Authored: Wed Dec 10 14:39:59 2014 -0500 Committer: Mark Payne <[email protected]> Committed: Wed Dec 10 14:39:59 2014 -0500 ---------------------------------------------------------------------- assemblies/nifi/src/main/assembly/dependencies.xml | 12 ++++++++++++ .../resources/src/main/resources/bin/nifi-status.bat | 8 ++++---- .../framework/resources/src/main/resources/bin/nifi.sh | 4 +--- .../resources/src/main/resources/bin/run-nifi.bat | 6 +++--- .../resources/src/main/resources/bin/start-nifi.bat | 7 ++++--- .../resources/src/main/resources/bin/stop-nifi.bat | 8 ++++---- 6 files changed, 28 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/82e42fad/assemblies/nifi/src/main/assembly/dependencies.xml ---------------------------------------------------------------------- diff --git a/assemblies/nifi/src/main/assembly/dependencies.xml b/assemblies/nifi/src/main/assembly/dependencies.xml index 339275b..97f3d4e 100644 --- a/assemblies/nifi/src/main/assembly/dependencies.xml +++ b/assemblies/nifi/src/main/assembly/dependencies.xml @@ -27,6 +27,18 @@ <scope>runtime</scope> <outputDirectory>lib</outputDirectory> <useTransitiveFiltering>true</useTransitiveFiltering> + <excludes> + <exclude>nifi-bootstrap</exclude> + </excludes> + </dependencySet> + + <dependencySet> + <scope>runtime</scope> + <outputDirectory>lib/bootstrap</outputDirectory> + <useTransitiveFiltering>true</useTransitiveFiltering> + <includes> + <include>nifi-bootstrap</include> + </includes> </dependencySet> </dependencySets> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/82e42fad/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat index ed9c516..d00f31c 100644 --- a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat +++ b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat @@ -1,3 +1,5 @@ +@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 @@ -15,18 +17,16 @@ rem See the License for the specific language governing permissions and rem limitations under the License. rem -@echo off - 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 LIB_DIR=%~dp0..\lib +SET LIB_DIR=%~dp0..\lib\bootstrap SET CONF_DIR=%~dp0..\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%\nifi-bootstrap*.jar -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.bootstrap.RunNiFi +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/82e42fad/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi.sh ---------------------------------------------------------------------- diff --git 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 index ad90d5b..60afa48 100644 --- 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 @@ -166,15 +166,13 @@ run() { fi echo - echo "Classpath: $CLASSPATH" - 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/nifi-bootstrap*.jar -Xms12m -Xmx24m -Dorg.apache.nifi.bootstrap.config.file="$BOOTSTRAP_CONF" org.apache.nifi.bootstrap.RunNiFi $1 + exec "$JAVA" -cp "$NIFI_HOME"/lib/bootstrap/* -Xms12m -Xmx24m -Dorg.apache.nifi.bootstrap.config.file="$BOOTSTRAP_CONF" org.apache.nifi.bootstrap.RunNiFi $1 } main() { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/82e42fad/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat index fdff815..5bab388 100644 --- a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat +++ b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat @@ -1,3 +1,4 @@ +@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 @@ -15,18 +16,17 @@ rem See the License for the specific language governing permissions and rem limitations under the License. rem -@echo off 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 LIB_DIR=%~dp0..\lib +SET LIB_DIR=%~dp0..\lib\bootstrap SET CONF_DIR=%~dp0..\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%\nifi-bootstrap*.jar -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.bootstrap.RunNiFi +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/82e42fad/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat index ba4739a..882b719 100644 --- a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat +++ b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat @@ -1,3 +1,5 @@ +@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 @@ -15,18 +17,17 @@ rem See the License for the specific language governing permissions and rem limitations under the License. rem -@echo off 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 LIB_DIR=%~dp0..\lib +SET LIB_DIR=%~dp0..\lib\bootstrap SET CONF_DIR=%~dp0..\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%\nifi-bootstrap*.jar -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.bootstrap.RunNiFi +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/82e42fad/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat index 828be6e..40c2d57 100644 --- a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat +++ b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat @@ -1,3 +1,5 @@ +@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 @@ -15,18 +17,16 @@ rem See the License for the specific language governing permissions and rem limitations under the License. rem -@echo off - 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 LIB_DIR=%~dp0..\lib +SET LIB_DIR=%~dp0..\lib\bootstrap SET CONF_DIR=%~dp0..\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%\nifi-bootstrap*.jar -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.bootstrap.RunNiFi +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%
