NIFI-145: Moved bootstrap jar into its own directory: lib/bootstrap

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>
 

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%

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() {

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%

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%

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%