From d74179036db9b53b46f03dd9114e706b14677ea0 Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Thu, 5 Dec 2019 19:01:02 -0500
Subject: [PATCH] Support both old and new scheme, fix very old bug about
 pathing

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 build.xml         |  2 +-
 build_ng2.xml     |  8 ++++----
 common.properties |  2 +-
 deploy.xml        | 28 ++++++++++++++++------------
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/build.xml b/build.xml
index 313559a..35b6616 100644
--- a/build.xml
+++ b/build.xml
@@ -17,7 +17,7 @@
   <property name="home" value="${zlux-app-server}"/>
   <property name="buildRel" value="zlux-build"/>
   <property name="build" value="${capstone}/zlux-build"/>
-  <condition name="instanceMode">
+  <condition property="instanceMode">
     <isset property="env.INSTANCE_DIR"/>
   </condition>
   <!-- instanceMode is the new standard, non-instanceMode is for compatibility -->
diff --git a/build_ng2.xml b/build_ng2.xml
index 0277e1c..b9ce663 100644
--- a/build_ng2.xml
+++ b/build_ng2.xml
@@ -104,7 +104,7 @@
   </target>
   
   <target name="buildPlugin" depends="antPlugin" unless="build.xmlRan">
-    <property name="absolutePlugin" location="${pluginDir}/${plugin}"/>
+    <property name="absolutePlugin" location="${capstone}/zlux-app-server/lib/${plugin}"/>
     <if>
       <not>
         <or>
@@ -114,10 +114,10 @@
       </not>
       <then>
         <antcall target="npmInstall" unless:set="noInstall">
-          <param name="packagejson.Location" value="${pluginDir}/${plugin}"/>
+          <param name="packagejson.Location" value="${capstone}/zlux-app-server/lib/${plugin}"/>
         </antcall>
         <antcall target="npmBuild">
-          <param name="packagejson.Location" value="${pluginDir}/${plugin}"/>
+          <param name="packagejson.Location" value="${capstone}/zlux-app-server/lib/${plugin}"/>
           <param name="buildType" value="build"/>
         </antcall>
       </then>
@@ -125,7 +125,7 @@
   
     <for param="subfolder">
       <path>
-        <dirset dir="${pluginDir}/${plugin}" includes="*"/>
+        <dirset dir="${capstone}/zlux-app-server/lib/${plugin}" includes="*"/>
       </path>
       <sequential>
         <antcall target="npmInstall" unless:set="noInstall">
diff --git a/common.properties b/common.properties
index d3e8dc6..4f78c5d 100644
--- a/common.properties
+++ b/common.properties
@@ -1 +1 @@
-plugins=../zlux-app-server/deploy/instance/ZLUX/plugins
+plugins=../zlux-app-server/defaults/plugins
diff --git a/deploy.xml b/deploy.xml
index 8f823ad..4eb89d6 100644
--- a/deploy.xml
+++ b/deploy.xml
@@ -42,9 +42,14 @@
     <mkdir dir="${siteActions}"/>
     <mkdir dir="${siteRecognizers}"/>
 
-    <mkdir dir="${instanceDir}/plugins"/>
+    <property name="serverConfig" value="${instanceDir}/ZLUX/serverConfig" unless:set="instanceMode"/>
+    <property name="serverConfig" value="${instanceDir}/serverConfig" if:set="instanceMode"/>
+    <property name="instancePlugins" value="${instanceDir}/ZLUX/plugins" unless:set="instanceMode"/>
+    <property name="instancePlugins" value="${instanceDir}/plugins" if:set="instanceMode"/>
+    
+    <mkdir dir="${instancePlugins}"/>
+    <mkdir dir="${serverConfig}"/>
     <mkdir dir="${instanceDir}/ZLUX/pluginStorage"/>
-    <mkdir dir="${instanceDir}/serverConfig"/>
     <!-- A common storage area for apps to deploy their configs into for desktop behavior -->
     <property name="instanceActions" value="${instanceDir}/ZLUX/pluginStorage/org.zowe.zlux.ng2desktop/actions"/>
     <property name="instanceRecognizers" value="${instanceDir}/ZLUX/pluginStorage/org.zowe.zlux.ng2desktop/recognizers"/>
@@ -54,14 +59,14 @@
     <mkdir dir="${instanceDir}/users"/>
     <mkdir dir="${instanceDir}/groups"/>
     <!-- # MVD bootstrap -->
-    <copy unless:set="isZos" todir="${instanceDir}/plugins">
+    <copy unless:set="isZos" todir="${instancePlugins}">
       <fileset dir="${pluginDir}" includes="*.json"/>
     </copy>
     <exec if:set="isZos" executable="sh">
-      <arg line="-c 'cp -pR ${pluginDir}/*.json ${instanceDir}/plugins'"/>
+      <arg line="-c 'cp -pR ${pluginDir}/*.json ${instancePlugins}'"/>
     </exec>
     
-    <copy unless:set="isZos" todir="${instanceDir}/serverConfig">
+    <copy unless:set="isZos" todir="${serverConfig}">
       <fileset dir="${home}/defaults/serverConfig">
         <include name="server.json"/>
         <include name="zlux.keystore.cer"/>
@@ -77,7 +82,7 @@
                   ${home}/defaults/serverConfig/zlux.keystore.key
                   ${home}/defaults/serverConfig/apiml-localca.cer
                   ${home}/defaults/serverConfig/tomcat.xml
-                  ${instanceDir}/serverConfig'"/>
+                  ${serverConfig}'"/>
     </exec>
     <antcall target="traverse"/>
     <if>
@@ -94,9 +99,9 @@
       </then>
     </if>
 
-    <chmod unless:set="isWindows" dir="${instanceDir}/serverConfig" perm="750"/>
+    <chmod unless:set="isWindows" dir="${serverConfig}" perm="750"/>
     <chmod unless:set="isWindows" perm="640">
-      <fileset dir="${instanceDir}/serverConfig"/>
+      <fileset dir="${serverConfig}"/>
     </chmod>
   </target>
 
@@ -104,15 +109,14 @@
     <delete quiet="true" dir="${instanceDir}"/>
     <delete quiet="true" dir="${siteDir}"/>
     <delete quiet="true" includeEmptyDirs="true">
-      <fileset dir="${instanceDir}" includes="users/*/ZLUX, groups/*/ZLUX"/>
+      <fileset dir="${instanceDir}" includes="users/*, groups/*"/>
     </delete>
   </target>
   
   <target name="devClean">
-    <delete quiet="true" dir="${instanceDir}/plugins"/>
-    <delete quiet="true" dir="${siteDir}/plugins"/>
+    <delete quiet="true" dir="${instancePlugins}"/>
     <delete quiet="true" includeEmptyDirs="true">
-      <fileset dir="${instanceDir}" includes="users/*/ZLUX, groups/*/ZLUX"/>
+      <fileset dir="${instanceDir}" includes="users/*, groups/*"/>
     </delete>
   </target>
 </project>