From c3f8e11b11d56d01960bcb753aa389b0496d5a1b Mon Sep 17 00:00:00 2001
From: Bryan Rosander <brosander@apache.org>
Date: Tue, 6 Dec 2016 10:58:41 -0500
Subject: [PATCH] MINIFI-156 - Windows script fixes from NiFi

---
 .../src/main/resources/bin/dump-minifi.bat    |  2 +-
 .../src/main/resources/bin/minifi.sh          |  2 +
 .../src/main/resources/bin/run-minifi.bat     |  2 +-
 .../src/main/resources/bin/status-minifi.bat  |  2 +-
 .../src/main/assembly/dependencies.xml        |  2 +-
 .../src/main/resources/{ => bin}/config.bat   |  1 -
 .../src/main/resources/{ => bin}/config.sh    |  6 +--
 .../src/main/resources/classpath/logback.xml  | 37 +++++++++++++++++++
 8 files changed, 46 insertions(+), 8 deletions(-)
 rename minifi-toolkit/minifi-toolkit-assembly/src/main/resources/{ => bin}/config.bat (99%)
 rename minifi-toolkit/minifi-toolkit-assembly/src/main/resources/{ => bin}/config.sh (95%)
 create mode 100644 minifi-toolkit/minifi-toolkit-assembly/src/main/resources/classpath/logback.xml

diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/dump-minifi.bat b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/dump-minifi.bat
index 6e7897b3e..3ef82663b 100644
--- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/dump-minifi.bat
+++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/dump-minifi.bat
@@ -18,7 +18,7 @@ rem
 
 rem Set environment variables
 
-call minifi-env.bat
+call %~sdp0\minifi-env.bat
 
 rem Use JAVA_HOME if it's set; otherwise, just use java
 
diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/minifi.sh b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/minifi.sh
index 5469382a8..11446f3d3 100755
--- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/minifi.sh
+++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/minifi.sh
@@ -250,6 +250,8 @@ run() {
         fi;
 
         MINIFI_HOME=$(cygpath --path --windows "${MINIFI_HOME}")
+        MINIFI_LOG_DIR=$(cygpath --path --windows "${MINIFI_LOG_DIR}")
+        MINIFI_PID_DIR=$(cygpath --path --windows "${MINIFI_PID_DIR}")
         BOOTSTRAP_CONF=$(cygpath --path --windows "${BOOTSTRAP_CONF}")
         BOOTSTRAP_CONF_DIR=$(cygpath --path --windows "${BOOTSTRAP_CONF_DIR}")
         BOOTSTRAP_LIBS=$(cygpath --path --windows "${BOOTSTRAP_LIBS}")
diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/run-minifi.bat b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/run-minifi.bat
index 7bc5d31e7..c26c940e2 100644
--- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/run-minifi.bat
+++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/run-minifi.bat
@@ -18,7 +18,7 @@ rem
 
 rem Set environment variables
 
-call minifi-env.bat
+call %~sdp0\minifi-env.bat
 
 rem Use JAVA_HOME if it's set; otherwise, just use java
 
diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/status-minifi.bat b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/status-minifi.bat
index 8189d900e..0115822b8 100644
--- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/status-minifi.bat
+++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/status-minifi.bat
@@ -16,7 +16,7 @@ rem    See the License for the specific language governing permissions and
 rem    limitations under the License.
 rem
 
-call minifi-env.bat
+call %~sdp0\minifi-env.bat
 
 rem Use JAVA_HOME if it's set; otherwise, just use java
 
diff --git a/minifi-toolkit/minifi-toolkit-assembly/src/main/assembly/dependencies.xml b/minifi-toolkit/minifi-toolkit-assembly/src/main/assembly/dependencies.xml
index f4f0b7a1a..b6ffcef03 100644
--- a/minifi-toolkit/minifi-toolkit-assembly/src/main/assembly/dependencies.xml
+++ b/minifi-toolkit/minifi-toolkit-assembly/src/main/assembly/dependencies.xml
@@ -35,7 +35,7 @@
     <fileSets>
         <fileSet>
             <directory>${project.basedir}/src/main/resources</directory>
-            <outputDirectory>bin/</outputDirectory>
+            <outputDirectory>/</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
     </fileSets>
diff --git a/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/config.bat b/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/bin/config.bat
similarity index 99%
rename from minifi-toolkit/minifi-toolkit-assembly/src/main/resources/config.bat
rename to minifi-toolkit/minifi-toolkit-assembly/src/main/resources/bin/config.bat
index 596708e9d..5366cc5bb 100644
--- a/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/config.bat
+++ b/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/bin/config.bat
@@ -37,4 +37,3 @@ SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.mini
 
 cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %*
 
-popd
diff --git a/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/config.sh b/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/bin/config.sh
similarity index 95%
rename from minifi-toolkit/minifi-toolkit-assembly/src/main/resources/config.sh
rename to minifi-toolkit/minifi-toolkit-assembly/src/main/resources/bin/config.sh
index 12963cb25..a8bb28635 100755
--- a/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/config.sh
+++ b/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/bin/config.sh
@@ -102,9 +102,9 @@ run() {
     sudo_cmd_prefix=""
     if $cygwin; then
         MINIFI_TOOLKIT_HOME=$(cygpath --path --windows "${MINIFI_TOOLKIT_HOME}")
-        CLASSPATH=$(cygpath --path --windows "${LIBS}")
+        CLASSPATH="$MINIFI_TOOLKIT_HOME/classpath;$(cygpath --path --windows "${LIBS}")"
     else
-        CLASSPATH="${LIBS}"
+        CLASSPATH="$MINIFI_TOOLKIT_HOME/classpath:${LIBS}"
     fi
 
     echo
@@ -119,4 +119,4 @@ run() {
 }
 
 init
-run "$@"
\ No newline at end of file
+run "$@"
diff --git a/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/classpath/logback.xml b/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/classpath/logback.xml
new file mode 100644
index 000000000..e93925199
--- /dev/null
+++ b/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/classpath/logback.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ /*
+  ~  * 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.
+  ~  */
+  -->
+
+<configuration scan="true" scanPeriod="30 seconds">
+    <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+        <resetJUL>true</resetJUL>
+    </contextListener>
+	
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>%date %level [%thread] %logger{40} %msg%n</pattern>
+        </encoder>
+	</appender>
+
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE"/>
+    </root>
+    
+</configuration>