diff --git a/bin/configure.sh b/bin/configure.sh index 36276d8..499eaac 100755 --- a/bin/configure.sh +++ b/bin/configure.sh @@ -54,7 +54,9 @@ cd ../lib CONFIG_FILE=$ZWE_CLI_PARAMETER_CONFIG $NODE_BIN initInstance.js cd ${COMPONENT_HOME}/share/zlux-app-server/bin/init -if [ "${ZWE_zowe_useConfigmgr}" = "true" ]; then +if [ "${ZWE_components_app_server_zowe_useConfigmgr}" = "false" ]; then + . ./plugins-init.sh +elif [ "${ZWE_zowe_useConfigmgr}" = "true" ]; then _CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/components/app-server/share/zlux-app-server/bin/init/plugins-init.js" else . ./plugins-init.sh diff --git a/package-lock.json b/package-lock.json index a9f44f3..bf05b4e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "@rocketsoftware/eureka-js-client": "~4.5.6", "@rocketsoftware/express-ws": "^5.0.0", "accept-language-parser": "~1.5.0", - "axios": "~0.22.0", + "axios": "~1.6.7", "bluebird": "~3.5.1", "body-parser": "~1.20.0", "cookie-parser": "~1.4.3", @@ -108,7 +108,7 @@ "@types/node": "~14.0.0", "@types/qs": "6.9.3", "accept-language-parser": "~1.5.0", - "axios": "~0.22.0", + "axios": "~1.6.7", "bluebird": "~3.5.1", "body-parser": "~1.20.0", "chai": "~4.2.0", diff --git a/schemas/app-server-config.json b/schemas/app-server-config.json index b196a8a..fbdbc51 100755 --- a/schemas/app-server-config.json +++ b/schemas/app-server-config.json @@ -6,6 +6,18 @@ "type": "object", "additionalProperties": true, "properties": { + "zowe": { + "type": "object", + "additionalProperties": true, + "description": "Contains customizations from the Zowe global configuration.", + "properties": { + "useConfigmgr": { + "type": "boolean", + "default": true, + "description": "Determines whether configmgr will be used during the startup proceedure, such as to register plugins." + } + } + }, "node": { "type": "object", "description": "Configuration options specific to the app-server and things it depends upon",