Skip to content

Commit 99a45ff

Browse files
committed
Merge branch 'wktui-565' into 'develop-2.0'
Adding support for ServerTemplate keystores to the archive editor See merge request weblogic-cloud/weblogic-toolkit-ui!429
2 parents 1f7e039 + 4a1d703 commit 99a45ff

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

electron/app/js/wdtArchive.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,15 @@ function getEntryTypes() {
186186
fileHelp: i18n.t('wdt-archiveType-serverKeystore-fileHelp'),
187187
pathPrefix: 'config/wlsdeploy/servers/'
188188
},
189+
'serverTemplateKeystore': {
190+
name: i18n.t('wdt-archiveType-serverTemplateKeystore'),
191+
subtype: 'file',
192+
segregatedLabel: i18n.t('wdt-archiveType-serverTemplateSegregationLabel'),
193+
segregatedHelp: i18n.t('wdt-archiveType-serverTemplateSegregationHelp'),
194+
fileLabel: i18n.t('wdt-archiveType-serverTemplateKeystore-fileLabel'),
195+
fileHelp: i18n.t('wdt-archiveType-serverTemplateKeystore-fileHelp'),
196+
pathPrefix: 'config/wlsdeploy/serverTemplates/'
197+
},
189198
'sharedLibrary': {
190199
name: i18n.t('wdt-archiveType-sharedLibrary'),
191200
subtype: 'either',
@@ -384,6 +393,7 @@ async function _validateArchiveEntryData(targetWindow, entryType, typeDetail, en
384393
case 'coherenceConfig':
385394
case 'jmsForeignServerBinding':
386395
case 'serverKeystore':
396+
case 'serverTemplateKeystore':
387397
if (!_validateRequiredString(targetWindow, entryType, typeDetail.segregatedLabel, entryData.segregatedName)) {
388398
resolve(false);
389399
} else {

electron/app/locales/en/electron.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,13 @@
464464
"wdt-archiveType-serverSegregationLabel": "Server Name",
465465
"wdt-archiveType-serverSegregationHelp": "Enter the name of the server to use",
466466

467+
"wdt-archiveType-serverTemplateKeystore": "Server Template Keystore",
468+
"wdt-archiveType-serverTemplateKeystore-fileLabel": "Server Template Keystore File",
469+
"wdt-archiveType-serverTemplateKeystore-fileHelp": "Choose the full path to the server template keystore file to add under the specific server template",
470+
471+
"wdt-archiveType-serverTemplateSegregationLabel": "Server Template Name",
472+
"wdt-archiveType-serverTemplateSegregationHelp": "Enter the name of the server template to use",
473+
467474
"wdt-archiveType-sharedLibrary": "Shared Library",
468475
"wdt-archiveType-sharedLibrary-dirLabel": "Exploded Shared Library Directory",
469476
"wdt-archiveType-sharedLibrary-dirHelp": "Choose the full path to the exploded shared library directory",

0 commit comments

Comments
 (0)