From 7a8ec36477d00c3db366fe4c25684736ad846aae Mon Sep 17 00:00:00 2001
From: Yan Li <raymondyanli@gmail.com>
Date: Thu, 6 Jun 2019 13:28:22 -0400
Subject: [PATCH 1/6] adding AppScan config file

Signed-off-by: Yan Li <raymondyanli@gmail.com>
---
 zlux-build.ppf | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 zlux-build.ppf

diff --git a/zlux-build.ppf b/zlux-build.ppf
new file mode 100644
index 0000000..621cb15
--- /dev/null
+++ b/zlux-build.ppf
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  This program and the accompanying materials are made available under the terms of the
+  Eclipse Public License v2.0 which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-v20.html
+  SPDX-License-Identifier: EPL-2.0
+  Copyright Contributors to the Zowe Project.
+-->
+<Project default_configuration_name="Configuration 1" fallback_default_config_name="Configuration 1" file_encoding="ISO-8859-1" file_extension_set_name="javascript" ltd_name="javascript" name="zlux-build" version="9.0.3.11">
+	<Configuration name="Configuration 1"/>
+	<FileExtensions>
+		<FileExtension extension="js" is_exclude="false" is_project_exclusion="false" is_valid_assess="true" is_web="false"/>
+	</FileExtensions>
+	<Source exclude="false" path="." web="false"/>
+	<ProjectScanSettings cache_va="false" global_rules="false" string_analysis="false"/>
+</Project>

From cfc13bf891e10103ee98495e9c041bfddad88849 Mon Sep 17 00:00:00 2001
From: Sean Grady <sgrady@rocketsoftware.com>
Date: Thu, 20 Jun 2019 11:42:49 -0400
Subject: [PATCH 2/6] Do build for zsf

Signed-off-by: Sean Grady <sgrady@rocketsoftware.com>
---
 build_ng2.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build_ng2.xml b/build_ng2.xml
index 0ff2226..6b55f1b 100644
--- a/build_ng2.xml
+++ b/build_ng2.xml
@@ -150,6 +150,10 @@
       <param name="packagejson.Location" value="${capstone}/zlux-app-manager/bootstrap"/>
       <param name="buildType" value="build"/>
     </antcall>
+    <antcall target="npmBuild">
+      <param name="packagejson.Location" value="${capstone}/zlux-server-framework"/>
+      <param name="buildType" value="build"/>
+    </antcall>    
   </target>
   
   <target name="desktopBuild"><!--We could pass different args for virtual-desktop if we wanted-->

From 94aa2ffb1eec1494fd1290393c1825c1afa2e984 Mon Sep 17 00:00:00 2001
From: Dmitry Nikolaev <dnikolaev@rocketsoftware.com>
Date: Fri, 21 Jun 2019 18:30:49 +0200
Subject: [PATCH 3/6] Deploy tomcat.xml

Signed-off-by: Dmitry Nikolaev <dnikolaev@rocketsoftware.com>
---
 deploy.sh  | 1 +
 deploy.xml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/deploy.sh b/deploy.sh
index f484df4..ea455c5 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -63,6 +63,7 @@ cp -vr ../zlux-app-server/config/zluxserver.json ../zlux-app-server/deploy/insta
 cp -vr ../zlux-app-server/config/zlux.keystore.key ../zlux-app-server/deploy/instance/ZLUX/serverConfig
 cp -vr ../zlux-app-server/config/zlux.keystore.cer ../zlux-app-server/deploy/instance/ZLUX/serverConfig
 cp -vr ../zlux-app-server/config/apiml-localca.cer ../zlux-app-server/deploy/instance/ZLUX/serverConfig
+cp -vr ../zlux-app-server/config/tomcat.xml ../zlux-app-server/deploy/instance/ZLUX/serverConfig
 
 cp -vr ../zlux-app-server/pluginDefaults/* ../zlux-app-server/deploy/instance/ZLUX/pluginStorage
 
diff --git a/deploy.xml b/deploy.xml
index 7daed0b..620c7f1 100644
--- a/deploy.xml
+++ b/deploy.xml
@@ -85,6 +85,7 @@
         <include name="zlux.keystore.cer"/>
         <include name="zlux.keystore.key"/>
         <include name="apiml-localca.cer"/>
+        <include name="tomcat.xml"/>
       </fileset>
     </copy>
     <exec if:set="isZos" executable="sh">
@@ -93,6 +94,7 @@
                   ${home}/config/zlux.keystore.cer
                   ${home}/config/zlux.keystore.key
                   ${home}/config/apiml-localca.cer
+                  ${home}/config/tomcat.xml
                   ${deploy}/instance/ZLUX/serverConfig'"/>
     </exec>
 

From 4dff1d87849dac68a0e3518e12ed8495e2d88a99 Mon Sep 17 00:00:00 2001
From: Timothy Gerstel <tgerstel@rocketsoftware.com>
Date: Thu, 27 Jun 2019 16:47:21 -0400
Subject: [PATCH 4/6] Deploy script now removes all plugin directories before
 copying from root plugin folder.  Deploy folders now retrieve contents from
 root plugin directory, rather than deploy/product

Signed-off-by: Timothy Gerstel <tgerstel@rocketsoftware.com>
---
 deploy.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/deploy.xml b/deploy.xml
index 7daed0b..f4e01eb 100644
--- a/deploy.xml
+++ b/deploy.xml
@@ -28,6 +28,12 @@
   </condition>
 
   <target name="deploy">
+    <delete quiet="true" dir="${deploy}/product/ZLUX/plugins"/>
+    <delete quiet="true" dir="${deploy}/instance/ZLUX/plugins"/>
+    <delete quiet="true" dir="${deploy}/site/ZLUX/plugins"/>
+    <delete quiet="true" includeEmptyDirs="true">
+      <fileset dir="${deploy}" includes="instance/users/*/ZLUX, instance/groups/*/ZLUX"/>
+    </delete>
     <mkdir dir="${deploy}/product/ZLUX/plugins"/>
     <mkdir dir="${deploy}/product/ZLUX/pluginStorage"/>
     <mkdir dir="${deploy}/product/ZLUX/serverConfig"/>
@@ -73,10 +79,10 @@
     </exec>
 
     <copy unless:set="isZos" todir="${deploy}/instance/ZLUX/plugins">
-      <fileset dir="${deploy}/product/ZLUX/plugins"/>
+      <fileset dir="${pluginDir}" includes="*.json"/>
     </copy>
     <exec if:set="isZos" executable="sh">
-      <arg line="-c 'cp -pR ${deploy}/product/ZLUX/plugins/ ${deploy}/instance/ZLUX/plugins'"/>
+      <arg line="-c 'cp -pR ${pluginDir}/*.json ${deploy}/instance/ZLUX/plugins'"/>
     </exec>
     
     <copy unless:set="isZos" todir="${deploy}/instance/ZLUX/serverConfig">

From 612a0263146fac2e32fb08699fde8950f791f3e7 Mon Sep 17 00:00:00 2001
From: Timothy Gerstel <tgerstel@rocketsoftware.com>
Date: Tue, 16 Jul 2019 11:40:42 -0400
Subject: [PATCH 5/6] Remove plugin folder from structure before copying plugin
 JSONs

Signed-off-by: Timothy Gerstel <tgerstel@rocketsoftware.com>
---
 deploy.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/deploy.sh b/deploy.sh
index ea455c5..e408d1f 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -33,6 +33,10 @@
 # Don't do permission changes in this script because final changes such as these happen after this script is executed
 # Such as, currently in zowe-runtime-authorize.sh
 
+rm -rf ../zlux-app-server/deploy/product/ZLUX/plugins
+rm -rf ../zlux-app-server/deploy/site/ZLUX/plugins
+rm -rf ../zlux-app-server/deploy/instance/ZLUX/plugins
+
 mkdir -p ../zlux-app-server/deploy/product
 mkdir -p ../zlux-app-server/deploy/product/ZLUX
 mkdir -p ../zlux-app-server/deploy/product/ZLUX/plugins
@@ -63,7 +67,6 @@ cp -vr ../zlux-app-server/config/zluxserver.json ../zlux-app-server/deploy/insta
 cp -vr ../zlux-app-server/config/zlux.keystore.key ../zlux-app-server/deploy/instance/ZLUX/serverConfig
 cp -vr ../zlux-app-server/config/zlux.keystore.cer ../zlux-app-server/deploy/instance/ZLUX/serverConfig
 cp -vr ../zlux-app-server/config/apiml-localca.cer ../zlux-app-server/deploy/instance/ZLUX/serverConfig
-cp -vr ../zlux-app-server/config/tomcat.xml ../zlux-app-server/deploy/instance/ZLUX/serverConfig
 
 cp -vr ../zlux-app-server/pluginDefaults/* ../zlux-app-server/deploy/instance/ZLUX/pluginStorage
 

From 2e573998a0f9dd048fd470b7f86ae24e89bb1293 Mon Sep 17 00:00:00 2001
From: Timothy Gerstel <tgerstel@rocketsoftware.com>
Date: Wed, 17 Jul 2019 08:55:04 -0400
Subject: [PATCH 6/6] Tomcat config deploy was removed for some reason

Signed-off-by: Timothy Gerstel <tgerstel@rocketsoftware.com>
---
 deploy.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deploy.sh b/deploy.sh
index e408d1f..53ce013 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -67,6 +67,7 @@ cp -vr ../zlux-app-server/config/zluxserver.json ../zlux-app-server/deploy/insta
 cp -vr ../zlux-app-server/config/zlux.keystore.key ../zlux-app-server/deploy/instance/ZLUX/serverConfig
 cp -vr ../zlux-app-server/config/zlux.keystore.cer ../zlux-app-server/deploy/instance/ZLUX/serverConfig
 cp -vr ../zlux-app-server/config/apiml-localca.cer ../zlux-app-server/deploy/instance/ZLUX/serverConfig
+cp -vr ../zlux-app-server/config/tomcat.xml ../zlux-app-server/deploy/instance/ZLUX/serverConfig
 
 cp -vr ../zlux-app-server/pluginDefaults/* ../zlux-app-server/deploy/instance/ZLUX/pluginStorage