Merge staging (v1.4.0)

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-->

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,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
 

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">
@@ -85,6 +91,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 +100,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>
 

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>