More path updates, remove zssPort from default json

Signed-off-by: 1000TurquoisePogs <[email protected]>

files/zlux/config/zluxserver.json

@@ -4,9 +4,9 @@
       "ipAddresses": ["0.0.0.0"],
       "port": 8544,
       //pfx (string), keys, certificates, certificateAuthorities, and certificateRevocationLists are all valid here.
-      "keys": ["../deploy/product/ZLUX/serverConfig/zlux.keystore.key"],
-      "certificates": ["../deploy/product/ZLUX/serverConfig/zlux.keystore.cer"],
-      "certificateAuthorities": ["../deploy/product/ZLUX/serverConfig/apiml-localca.cer"]
+      "keys": ["../defaults/serverConfig/zlux.keystore.key"],
+      "certificates": ["../defaults/serverConfig/zlux.keystore.cer"],
+      "certificateAuthorities": ["../defaults/serverConfig/apiml-localca.cer"]
     },
     "mediationLayer": {
       "server": {
@@ -37,13 +37,12 @@
 
 // All paths relative to ZLUX/node or ZLUX/bin
 // In real installations, these values will be configured during the install.
-  "rootDir":"../deploy",
-  "productDir":"../deploy/product",
+  "productDir":"../defaults",
   "siteDir":"../deploy/site",
   "instanceDir":"../deploy/instance",
   "groupsDir":"../deploy/instance/groups",
   "usersDir":"../deploy/instance/users",
-  "pluginsDir":"../deploy/instance/ZLUX/plugins",
+  "pluginsDir":"../defaults/plugins",
 
   "dataserviceAuthentication": {
     //this specifies the default authentication type for dataservices that didn't specify which type to use. These dataservices therefore should not expect a particular type of authentication to be used.
@@ -66,7 +65,5 @@
       } 
 
     }
-  },
-  // internal port, do not connect browser to this port
-  "zssPort":8542
+  }
 }

scripts/zowe-install-zlux.sh

@@ -29,10 +29,10 @@ do
   fi
 done
 
-mkdir -p zlux-app-server/pluginDefaults/org.zowe.zlux.ng2desktop/ui/launchbar/plugins
-cp -f ${INSTALL_DIR}/files/zlux/config/pinnedPlugins.json zlux-app-server/pluginDefaults/org.zowe.zlux.ng2desktop/ui/launchbar/plugins/
-cp -f ${INSTALL_DIR}/files/zlux/config/zluxserver.json zlux-app-server/config/
-cp -f ${INSTALL_DIR}/files/zlux/config/plugins/* zlux-app-server/plugins/
+mkdir -p zlux-app-server/defaults/ZLUX/pluginStorage/org.zowe.zlux.ng2desktop/ui/launchbar/plugins
+cp -f ${INSTALL_DIR}/files/zlux/config/pinnedPlugins.json zlux-app-server/defaults/ZLUX/pluginStorage/org.zowe.zlux.ng2desktop/ui/launchbar/plugins/
+cp -f ${INSTALL_DIR}/files/zlux/config/zluxserver.json zlux-app-server/defaults/serverConfig/server.json
+cp -f ${INSTALL_DIR}/files/zlux/config/plugins/* zlux-app-server/defaults/plugins
 
 echo "Unpax zssServer " >> $LOG_FILE
 cd zlux-app-server/bin
@@ -53,4 +53,4 @@ chmod ug+w bin/zssServer
 # and create logs
 chmod a+w log
 
-cd $INSTALL_DIR
+cd $INSTALL_DIR

scripts/zowe-verify.sh

@@ -629,7 +629,7 @@ fi
 #  "api-mediation/scripts/api-mediation-start-gateway.sh" \
 #  "explorer-jobs-api/scripts/jobs-api-server-start.sh" \
 #  "explorer-data-sets-api/scripts/data-sets-api-server-start.sh" \
-#  "zlux-app-server/config/zluxserver.json" \
+#  "zlux-app-server/defaults/serverConfig/server.json" \
 #  "vt-ng2/_defaultVT.json" \
 #  "tn3270-ng2/_defaultTN3270.json" \
 #  "jes_explorer/server/configs/config.json" \

tests/data/zluxserver.json

@@ -3,9 +3,9 @@
     "https": {
       "port": 8544,
       //pfx (string), keys, certificates, certificateAuthorities, and certificateRevocationLists are all valid here.
-      "keys": ["../deploy/product/ZLUX/serverConfig/zlux.keystore.key"],
-      "certificates": ["../deploy/product/ZLUX/serverConfig/zlux.keystore.cer"],
-      "certificateAuthorities": ["../deploy/product/ZLUX/serverConfig/apiml-localca.cer"]
+      "keys": ["../defaults/serverConfig/zlux.keystore.key"],
+      "certificates": ["../defaults/serverConfig/zlux.keystore.cer"],
+      "certificateAuthorities": ["../defaults/serverConfig/apiml-localca.cer"]
     },
     "mediationLayer": {
       "server": {
@@ -24,13 +24,12 @@
   },
 // All paths relative to ZLUX/node or ZLUX/bin
 // In real installations, these values will be configured during the install.
-  "rootDir":"../deploy",
-  "productDir":"../deploy/product",
+  "productDir":"../defaults",
   "siteDir":"../deploy/site",
   "instanceDir":"../deploy/instance",
   "groupsDir":"../deploy/instance/groups",
   "usersDir":"../deploy/instance/users",
-  "pluginsDir":"../deploy/instance/ZLUX/plugins",
+  "pluginsDir":"../defaults/plugins",
 
   "dataserviceAuthentication": {
     //this specifies the default authentication type for dataservices that didn't specify which type to use. These dataservices therefore should not expect a particular type of authentication to be used.

tests/test_zowe-zlux-configure-certificates.py

@@ -15,10 +15,10 @@
 
 
 def test_script_replaces_correctly():
-    if not os.path.exists("tmp/zlux-app-server/config"):
-        os.makedirs("tmp/zlux-app-server/config")
+    if not os.path.exists("tmp/zlux-app-server/defaults/serverConfig"):
+        os.makedirs("tmp/zlux-app-server/defaults/serverConfig")
     shutil.copy("tests/data/zluxserver.json",
-                "tmp/zlux-app-server/config/zluxserver.json")
+                "tmp/zlux-app-server/defaults/serverConfig/server.json")
 
     env = {
         "LOG_FILE": os.path.join(os.getcwd(), "tmp", "test.log"),
@@ -38,7 +38,7 @@ def test_script_replaces_correctly():
     assert result.stdout.strip() == ""
     assert result.stderr.strip() == ""
 
-    with open(os.path.join(env["TEMP_DIR"], "zlux-app-server", "config", "zluxserver.json")) as json_data:
+    with open(os.path.join(env["TEMP_DIR"], "zlux-app-server", "defaults", "serverConfig", "server.json")) as json_data:
         lines = []
         for line in json_data.readlines():
             if not line.strip().startswith("//"):