Update api-ml componentisation paths

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
zowe · Oct 1, 2019 · a4c052a · a4c052a
1 parent a507a89
commit a4c052a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/scripts/configure/zowe-configure.sh b/scripts/configure/zowe-configure.sh
@@ -46,7 +46,7 @@ echo "Beginning to configure zowe installed in ${ZOWE_ROOT_DIR}"
 
 if [[ $ZOWE_APIM_ENABLE_SSO == "true" ]]; then
     # Add APIML authentication plugin to zLUX
-    . $CONFIG_DIR/zowe-install-existing-plugin.sh $ZOWE_ROOT_DIR "org.zowe.zlux.auth.apiml" $ZOWE_ROOT_DIR/api-mediation/apiml-auth
+    . $CONFIG_DIR/zowe-install-existing-plugin.sh $ZOWE_ROOT_DIR "org.zowe.zlux.auth.apiml" $ZOWE_ROOT_DIR/components/api-mediation/apiml-auth
 
     # Activate the plugin
     _JSON='"apiml": { "plugins": ["org.zowe.zlux.auth.apiml"] }'

diff --git a/scripts/zowe-support.template.sh b/scripts/zowe-support.template.sh
@@ -149,12 +149,9 @@ else
 fi
 
 # Collect launch scripts
-set +A SCRIPTS '/zlux-app-server/bin/nodeCluster.sh'\
- '/api-mediation/scripts/api-mediation-start-discovery.sh'\
- '/api-mediation/scripts/api-mediation-start-catalog.sh'\
- '/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'\
+set +A SCRIPTS '/components/api-mediation/bin/start.sh'\
+ '/components/files-api/bin/start.sh'\
+ '/components/jobs-api/bin/start.sh'\
  '/jes_explorer/scripts/start-explorer-jes-ui-server.sh'\
  '/mvs_explorer/scripts/start-explorer-mvs-ui-server.sh'\
  '/uss_explorer/scripts/start-explorer-uss-ui-server.sh'

diff --git a/tests/test_zowe-zlux-configure-certificates.py b/tests/test_zowe-zlux-configure-certificates.py
@@ -46,8 +46,8 @@ def test_script_replaces_correctly():
         j = json.loads("".join(lines))
 
     assert j["node"]["https"]["keys"] \
-        == [env["ZOWE_ROOT_DIR"] + "/api-mediation/keystore/localhost/localhost.keystore.key"]
+        == [env["ZOWE_ROOT_DIR"] + "/components/api-mediation/keystore/localhost/localhost.keystore.key"]
     assert j["node"]["https"]["certificates"] \
-        == [env["ZOWE_ROOT_DIR"] + "/api-mediation/keystore/localhost/localhost.keystore.cer"]
+        == [env["ZOWE_ROOT_DIR"] + "/components/api-mediation/keystore/localhost/localhost.keystore.cer"]
     assert j["node"]["https"]["certificateAuthorities"] \
-        == [env["ZOWE_ROOT_DIR"] + "/api-mediation/keystore/local_ca/localca.cer"]
+        == [env["ZOWE_ROOT_DIR"] + "/components/api-mediation/keystore/local_ca/localca.cer"]