@hcl-software/dxclient 227.0.0 → 229.0.0

package/dist/packages/admintasks/src/utils/differential-report-utils.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -218,84 +209,83 @@ function getScope(configID) {
     });
     return rtnVal;
 }
-function generateSummaryReport(MasterDict) {
-    return __awaiter(this, void 0, void 0, function* () {
-        logger_1.logger.debug('Entering to the generateSummaryReport function');
-        try {
-            const reports = [['Application Servers', '/.*#Server_.*', 'name', 'True', ['serverType', 'APPLICATION_SERVER']],
-                ['Web Servers', '/.*#Server_.*', 'name', 'True', ['serverType', 'WEB_SERVER']],
-                ['Clusters', '/.*#ServerCluster_.*', 'name', 'False'],
-                ['Virtual Hosts', '.*VirtualHost_.*', 'name', 'False'],
-                ['Core Groups', '.*CoreGroup_.*', 'name', 'False'],
-                ['Data Sources', '.*DataSource_.*', 'name', 'True'],
-                ['JMS Providers', '.*JMSProvider_.*', 'name', 'True'],
-                ['J2C Resource Adapters', '.*J2CResourceAdapter_.*', 'name', 'True'],
-                ['SSL Configs', '.*SSLConfig_.*', 'alias', 'True'],
-                ['Mail Providers', '.*MailProvider_.*', 'name', 'True'],
-                ['URL Providers', '.*URLProvider_.*', 'name', 'True'],
-                ['JDBC Providers', '.*JDBCProvider_.*', 'name', 'True'],
-                ['Service Integration Buses', '.*SIBus_.*', 'name', 'False'],
-                ['Application Deployments', '.*ApplicationDeployment_.*', 'binariesURL', 'False'],
-                ['Servlet Cache Instances', '.*ServletCacheInstance_.*', 'name', 'True'],
-                ['Object Cache Instances', '.*ObjectCacheInstance_.*', 'name', 'True'],
-            ];
-            const skipString = '/(\\bdockerCell-\\S+\\b)/ig';
-            const reportRowHeaders = [];
-            const columnHeaders = MasterDict.CellList;
-            const reportTableData = [];
-            reports.forEach((report) => {
-                const list = [];
-                reportRowHeaders.push(report[0].toString());
-                columnHeaders.forEach((cell) => {
-                    const rElements = [];
-                    const keys = Object.keys(MasterDict);
-                    const configIDs = [];
-                    keys.forEach((key) => {
-                        if (new RegExp(`.*/${cell}${report[1]}`).test(key)) {
-                            configIDs.push(key);
-                        }
-                    });
-                    configIDs.forEach((configID) => {
-                        if (report.length === 5) {
-                            if (MasterDict[configID][report[4][0]] !== report[4][1]) {
-                                return;
-                            }
-                        }
-                        let value = MasterDict[configID][`${report[2]}`];
-                        const reportScope = report[3];
-                        if (reportScope === 'True') {
-                            const scope = getScope(configID);
-                            value = `<br>${value}<br>&nbsp;&nbsp;&nbsp;<font size="1">${scope}</font>`;
-                        }
-                        else {
-                            value = `<br>${value}`;
+async function generateSummaryReport(MasterDict) {
+    logger_1.logger.debug('Entering to the generateSummaryReport function');
+    try {
+        const reports = [['Application Servers', '/.*#Server_.*', 'name', 'True', ['serverType', 'APPLICATION_SERVER']],
+            ['Web Servers', '/.*#Server_.*', 'name', 'True', ['serverType', 'WEB_SERVER']],
+            ['Clusters', '/.*#ServerCluster_.*', 'name', 'False'],
+            ['Virtual Hosts', '.*VirtualHost_.*', 'name', 'False'],
+            ['Core Groups', '.*CoreGroup_.*', 'name', 'False'],
+            ['Data Sources', '.*DataSource_.*', 'name', 'True'],
+            ['JMS Providers', '.*JMSProvider_.*', 'name', 'True'],
+            ['J2C Resource Adapters', '.*J2CResourceAdapter_.*', 'name', 'True'],
+            ['SSL Configs', '.*SSLConfig_.*', 'alias', 'True'],
+            ['Mail Providers', '.*MailProvider_.*', 'name', 'True'],
+            ['URL Providers', '.*URLProvider_.*', 'name', 'True'],
+            ['JDBC Providers', '.*JDBCProvider_.*', 'name', 'True'],
+            ['Service Integration Buses', '.*SIBus_.*', 'name', 'False'],
+            ['Application Deployments', '.*ApplicationDeployment_.*', 'binariesURL', 'False'],
+            ['Servlet Cache Instances', '.*ServletCacheInstance_.*', 'name', 'True'],
+            ['Object Cache Instances', '.*ObjectCacheInstance_.*', 'name', 'True'],
+        ];
+        const skipString = '/(\\bdockerCell-\\S+\\b)/ig';
+        const reportRowHeaders = [];
+        const columnHeaders = MasterDict.CellList;
+        const reportTableData = [];
+        reports.forEach((report) => {
+            const list = [];
+            reportRowHeaders.push(report[0].toString());
+            columnHeaders.forEach((cell) => {
+                const rElements = [];
+                const keys = Object.keys(MasterDict);
+                const configIDs = [];
+                keys.forEach((key) => {
+                    if (new RegExp(`.*/${cell}${report[1]}`).test(key)) {
+                        configIDs.push(key);
+                    }
+                });
+                configIDs.forEach((configID) => {
+                    if (report.length === 5) {
+                        if (MasterDict[configID][report[4][0]] !== report[4][1]) {
+                            return;
                         }
-                        rElements.push(value);
-                    });
-                    rElements.sort();
-                    list.push(rElements.toString());
+                    }
+                    let value = MasterDict[configID][`${report[2]}`];
+                    const reportScope = report[3];
+                    if (reportScope === 'True') {
+                        const scope = getScope(configID);
+                        value = `<br>${value}<br>&nbsp;&nbsp;&nbsp;<font size="1">${scope}</font>`;
+                    }
+                    else {
+                        value = `<br>${value}`;
+                    }
+                    rElements.push(value);
                 });
-                reportTableData.push(list);
+                rElements.sort();
+                list.push(rElements.toString());
             });
-            const reportingTableTitle = 'Cell Summary';
-            let reportingTable = '<table style="table-layout:fixed" id="differential-report" border="2" cellpadding="2" cellspacing="0" width="50px">\n';
-            let tbody = `<tbody><tr align="left">\n<td colspan="3" rowspan="1" bgcolor="#999999" valign="top"><big><big><b>${reportingTableTitle}</b></big></big><br></td></tr>\n<tr>`;
-            tbody = `${tbody}<tr><td class="wrapped" bgcolor="#cccccc" valign="top"><b></b><b><br></b> </td>\n`;
-            columnHeaders.forEach((header) => {
-                tbody = `${tbody}<td class="wrapped" bgcolor="#cccccc" valign="top"><b>${header}</b><b><br></b> </td>\n`;
-            });
-            tbody = `${tbody}<tr>`;
-            let idx = 0;
-            reportRowHeaders.forEach((header) => {
-                tbody = `${tbody}<tr><td class="wrapped" bgcolor="#cccccc" valign="top"><b>${header}</b><b><br></b> </td>\n`;
-                reportTableData[idx].forEach((value) => {
-                    tbody = `${tbody}<td class="wrapped" valign="top">${value}<br></td>\n`;
-                });
-                tbody = `${tbody}</tr>\n`;
-                idx += 1;
+            reportTableData.push(list);
+        });
+        const reportingTableTitle = 'Cell Summary';
+        let reportingTable = '<table style="table-layout:fixed" id="differential-report" border="2" cellpadding="2" cellspacing="0" width="50px">\n';
+        let tbody = `<tbody><tr align="left">\n<td colspan="3" rowspan="1" bgcolor="#999999" valign="top"><big><big><b>${reportingTableTitle}</b></big></big><br></td></tr>\n<tr>`;
+        tbody = `${tbody}<tr><td class="wrapped" bgcolor="#cccccc" valign="top"><b></b><b><br></b> </td>\n`;
+        columnHeaders.forEach((header) => {
+            tbody = `${tbody}<td class="wrapped" bgcolor="#cccccc" valign="top"><b>${header}</b><b><br></b> </td>\n`;
+        });
+        tbody = `${tbody}<tr>`;
+        let idx = 0;
+        reportRowHeaders.forEach((header) => {
+            tbody = `${tbody}<tr><td class="wrapped" bgcolor="#cccccc" valign="top"><b>${header}</b><b><br></b> </td>\n`;
+            reportTableData[idx].forEach((value) => {
+                tbody = `${tbody}<td class="wrapped" valign="top">${value}<br></td>\n`;
             });
-            reportingTable = `${reportingTable}${tbody}</tbody></table><br>\n`;
-            const summaryReport = `
+            tbody = `${tbody}</tr>\n`;
+            idx += 1;
+        });
+        reportingTable = `${reportingTable}${tbody}</tbody></table><br>\n`;
+        const summaryReport = `
       <!DOCTYPE html>
       <html>\n<head>\n<meta http-equiv="content-type" content="text/html; charset=UTF-8">\n<title>Cell Summary Report</title>\n</head>\n<body>
       <head><style type="text/css">
@@ -348,7 +338,7 @@ function generateSummaryReport(MasterDict) {
       </style>
       </head>
       <body>
-      <div><h1>Cell Summary Report ${moment_1.default().format('MM/DD/YY h:mm:ss')}</h1>
+      <div><h1>Cell Summary Report ${(0, moment_1.default)().format('MM/DD/YY h:mm:ss')}</h1>
       <div class="Div1">
       <svg width="20" height="20">
       <rect width="20" height="20" style="fill:#87CEEB;stroke-width:3;stroke:rgb(0,0,0)" />
@@ -408,23 +398,22 @@ function generateSummaryReport(MasterDict) {
       </script>  
       </body>
       </html>`;
-            try {
-                const outputFileName = utils_1.getFileNameWithTimeStamp(constants_1.CONSTANT_VALUES.summaryReport);
-                const outputFileLocation = `${path_1.default.resolve(utils_1.getStoreDir(), constants_1.CONSTANT_VALUES.outputFileLocation)}/${constants_1.CONSTANT_VALUES.reportCFG}`;
-                const writeFileResponse = yield filesServices_1.fileServices.writeFile(summaryReport, outputFileLocation, `${outputFileName}.${constants_1.FileType.HTML}`);
-                logger_1.logger.info(utils_1.message('EXPORT_SUMMARY_REPORT_SUCCESS', { 0: writeFileResponse }));
-            }
-            catch (error) {
-                logger_1.logger.debug('Error in writing file %o', error);
-                return false;
-            }
+        try {
+            const outputFileName = (0, utils_1.getFileNameWithTimeStamp)(constants_1.CONSTANT_VALUES.summaryReport);
+            const outputFileLocation = `${path_1.default.resolve((0, utils_1.getStoreDir)(), constants_1.CONSTANT_VALUES.outputFileLocation)}/${constants_1.CONSTANT_VALUES.reportCFG}`;
+            const writeFileResponse = await filesServices_1.fileServices.writeFile(summaryReport, outputFileLocation, `${outputFileName}.${constants_1.FileType.HTML}`);
+            logger_1.logger.info((0, utils_1.message)('EXPORT_SUMMARY_REPORT_SUCCESS', { 0: writeFileResponse }));
         }
         catch (error) {
-            logger_1.logger.debug('Error in generating summary report %s', error.message);
+            logger_1.logger.debug('Error in writing file %o', error);
             return false;
         }
-        return true;
-    });
+    }
+    catch (error) {
+        logger_1.logger.debug('Error in generating summary report %s', error.message);
+        return false;
+    }
+    return true;
 }
 function getConfigIDNode(configID) {
     let rtnVal = 'UnKnown';
@@ -458,978 +447,977 @@ function getNameAttribute(resourceType) {
         rtnVal = 'alias';
     return rtnVal;
 }
-function generateResourceReport(MasterDict) {
-    return __awaiter(this, void 0, void 0, function* () {
-        logger_1.logger.debug('Entering to the generateResourceReport function:');
-        try {
-            const PropertiesDict = readProperties();
-            const resourceReportDefinitions = {
-                DataSource: [
-                    {
-                        Title: 'Data Source',
-                        ReportName: 'dataSourceRsc',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'Data Source Connection Pool',
-                        ReportName: 'connectionPoolRsc',
-                        ConfigPath: [
-                            'connectionPool',
-                        ],
-                    },
-                    {
-                        Title: 'Data Source Provider',
-                        ReportName: 'providerReportRsc',
-                        ConfigPath: [
-                            'provider',
-                        ],
-                    },
-                    {
-                        Title: 'Data Source Relational Resource Adpter',
-                        ReportName: 'resourceAdapterRsc',
-                        ConfigPath: [
-                            'relationalResourceAdapter',
-                        ],
-                    },
-                    {
-                        Title: 'Data Source Relational Resource Adpter Connector',
-                        ReportName: 'connectorRsc',
-                        ConfigPath: [
-                            'relationalResourceAdapter',
-                            'deploymentDescriptor',
-                        ],
-                    },
-                ],
-                J2CResourceAdapter: [
-                    {
-                        Title: 'J2C Resource Adapter',
-                        ReportName: 'resourceAdapterRsc',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'J2C Resource Adpter Connector',
-                        ReportName: 'connectorRsc',
-                        ConfigPath: [
-                            'deploymentDescriptor',
-                        ],
-                    },
-                ],
-                JDBCProvider: [
-                    {
-                        Title: 'JDBC Provider',
-                        ReportName: 'jdbcProviderRsc',
-                        ConfigPath: [
-                            '',
-                        ],
-                    },
-                ],
-                SIBus: [
-                    {
-                        Title: 'Service Integration Bus',
-                        ReportName: 'sibRsc',
-                        ConfigPath: [
-                            '',
-                        ],
-                    },
-                ],
-                ObjectCacheInstance: [
-                    {
-                        Title: 'Object Cache',
-                        ReportName: 'objectCacheRsc',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'Cache Provider',
-                        ReportName: 'cacheProviderRsc',
-                        ConfigPath: [
-                            'provider',
-                        ],
-                    },
-                ],
-                ServletCacheInstance: [
-                    {
-                        Title: 'Servlet Cache',
-                        ReportName: 'objectCacheRsc',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'Cache Provider',
-                        ReportName: 'cacheProviderRsc',
-                        ConfigPath: [
-                            'provider',
-                        ],
-                    },
-                    {
-                        Title: 'Disk Cache custom Performance Settings',
-                        ReportName: 'diskCacheCustomPerformanceSettingsRsc',
-                        ConfigPath: [
-                            'diskCacheCustomPerformanceSettings',
-                        ],
-                    },
-                    {
-                        Title: 'Disk Cache Eviction Policy',
-                        ReportName: 'diskCacheEvictionPolicyRsc',
-                        ConfigPath: [
-                            'diskCacheEvictionPolicy',
-                        ],
-                    },
-                ],
-                Security: [
-                    {
-                        Title: 'Global Security',
-                        ReportName: 'securityRsc',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Inbound',
-                        ReportName: 'csiv2Rsc',
-                        ConfigPath: [
-                            'CSI',
-                            'claims',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Inbound ID assertion',
-                        ReportName: 'csiv2idAssertRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'claims',
-                            'layers->IdentityAssertionLayer_',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Inbound ID assertion QOP',
-                        ReportName: 'csiv2idAssertQOPRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'claims',
-                            'layers->IdentityAssertionLayer_',
-                            'supportedQOP',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Inbound Message',
-                        ReportName: 'csiv2MessageRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'claims',
-                            'layers->MessageLayer_',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Inbound Message supported QOP',
-                        ReportName: 'csiv2MessageQOPRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'claims',
-                            'layers->MessageLayer_',
-                            'supportedQOP',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Inbound Message required QOP',
-                        ReportName: 'csiv2MessageQOPRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'claims',
-                            'layers->MessageLayer_',
-                            'requiredQOP',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Inbound Transport',
-                        ReportName: 'csiv2TransportRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'claims',
-                            'layers->TransportLayer_',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Inbound Transport Server Authentication',
-                        ReportName: 'csiv2TransportSrvSAuthRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'claims',
-                            'layers->TransportLayer_',
-                            'serverAuthentication',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Inbound Transport supported QOP',
-                        ReportName: 'csiv2TransportQOPRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'claims',
-                            'layers->TransportLayer_',
-                            'supportedQOP',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Inbound Transport required QOP',
-                        ReportName: 'csiv2TransportQOPRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'claims',
-                            'layers->TransportLayer_',
-                            'requiredQOP',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Outbound',
-                        ReportName: 'csiv2Rsc',
-                        ConfigPath: [
-                            'CSI',
-                            'performs',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Outbound ID assertion',
-                        ReportName: 'csiv2idAssertRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'performs',
-                            'layers->IdentityAssertionLayer_',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Outbound ID assertion QOP',
-                        ReportName: 'csiv2idAssertQOPRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'performs',
-                            'layers->IdentityAssertionLayer_',
-                            'supportedQOP',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Outbound Message',
-                        ReportName: 'csiv2MessageRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'performs',
-                            'layers->MessageLayer_',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Outbound Message supported QOP',
-                        ReportName: 'csiv2MessageQOPRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'performs',
-                            'layers->MessageLayer_',
-                            'supportedQOP',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Outbound Message required QOP',
-                        ReportName: 'csiv2MessageQOPRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'performs',
-                            'layers->MessageLayer_',
-                            'requiredQOP',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Outbound Transport',
-                        ReportName: 'csiv2TransportRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'performs',
-                            'layers->TransportLayer_',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Outbound Transport Server Authentication',
-                        ReportName: 'csiv2TransportSrvSAuthRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'performs',
-                            'layers->TransportLayer_',
-                            'serverAuthentication',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Outbound Transport supported QOP',
-                        ReportName: 'csiv2TransportQOPRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'performs',
-                            'layers->TransportLayer_',
-                            'supportedQOP',
-                        ],
-                    },
-                    {
-                        Title: 'Cell Default Common Secure Interoperability (CSI) Outbound Transport required QOP',
-                        ReportName: 'csiv2TransportQOPRsc',
-                        ConfigPath: [
-                            'CSI',
-                            'performs',
-                            'layers->TransportLayer_',
-                            'requiredQOP',
-                        ],
-                    },
-                    {
-                        Title: 'Certificate Expiration Monitor',
-                        ReportName: 'certExpMonitorRsc',
-                        ConfigPath: [
-                            'wsCertificateExpirationMonitor',
-                        ],
-                    },
-                    {
-                        Title: 'Certificate Expiration Monitor Notification',
-                        ReportName: 'notificationRsc',
-                        ConfigPath: [
-                            'wsCertificateExpirationMonitor',
-                            'wsNotification',
-                        ],
-                    },
-                    {
-                        Title: 'Certificate Expiration Monitor Scedule',
-                        ReportName: 'scheduleRsc',
-                        ConfigPath: [
-                            'wsCertificateExpirationMonitor',
-                            'wsSchedule',
-                        ],
-                    },
-                ],
-                SSLConfig: [
-                    {
-                        Title: 'SSL settings',
-                        ReportName: 'sslConfig1Rsc',
-                        ConfigPath: [
-                            'setting',
-                        ],
-                    },
-                    {
-                        Title: 'Ciphers',
-                        ReportName: 'ciphers',
-                        ConfigPath: [
-                            'setting',
-                            'trustStore',
-                        ],
-                        ReportFunc: 'ciphersReport',
-                    },
-                    {
-                        Title: 'Trust Store',
-                        ReportName: 'keyStoreRsc',
-                        ConfigPath: [
-                            'setting',
-                            'trustStore',
-                        ],
-                    },
-                    {
-                        Title: 'Key Store',
-                        ReportName: 'keyStoreRsc',
-                        ConfigPath: [
-                            'setting',
-                            'keyStore',
-                        ],
-                    },
-                    {
-                        Title: 'Trust Manager',
-                        ReportName: 'trustManagerRsc',
-                        ConfigPath: [
-                            'setting',
-                            'trustManager',
-                        ],
-                    },
-                    {
-                        Title: 'Key Manager',
-                        ReportName: 'keyManagerRsc',
-                        ConfigPath: [
-                            'setting',
-                            'keyManager',
-                        ],
-                    },
-                ],
-                ResourceEnvironmentProvider: [
-                    {
-                        Title: 'Resource Environment Provider',
-                        ReportName: 'rscEnvProviderRsc',
-                        ConfigPath: [
-                            '',
-                        ],
-                    },
-                ],
-                ResourceEnvEntry: [
-                    {
-                        Title: 'Resource Environment Entry',
-                        ReportName: 'rscEnvEntryRsc',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'Referencable',
-                        ReportName: 'referencableRsc',
-                        ConfigPath: [
-                            'referenceable',
-                        ],
-                    },
-                    {
-                        Title: 'Resource Environment Provider',
-                        ReportName: 'rscEnvProviderRsc',
-                        ConfigPath: [
-                            'provider',
-                        ],
-                    },
-                ],
-                Application: [
-                    {
-                        Title: 'Application Deployment',
-                        ReportName: 'applicationDeployment',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'Application Deployment Classloader',
-                        ReportName: 'applicationClassloader',
-                        ConfigPath: [
-                            'classloader',
-                        ],
-                    },
-                ],
-                ApplicationModules: [
-                    {
-                        Title: 'Application Module',
-                        ReportName: 'applicationDeployment',
-                        ConfigPath: [
-                            'modules',
-                        ],
-                    },
-                ],
-                JMSProvider: [
-                    {
-                        Title: 'JMS Provider',
-                        ReportName: 'jmsProviderRsc',
-                        ConfigPath: [
-                            '',
-                        ],
-                    },
-                ],
-                GenericJMSConnectionFactory: [
-                    {
-                        Title: 'JMS Connection Factory',
-                        ReportName: 'genericJMSConnectionFactoryRsc',
-                        ConfigPath: [
-                            '',
-                        ],
-                    },
-                    {
-                        Title: 'Session Pool',
-                        ReportName: 'connectionPoolRsc',
-                        ConfigPath: [
-                            'sessionPool',
-                        ],
-                    },
-                    {
-                        Title: 'JMS Provider',
-                        ReportName: 'jmsProviderRsc',
-                        ConfigPath: [
-                            'provider',
-                        ],
-                    },
-                    {
-                        Title: 'Connection Pool',
-                        ReportName: 'connectionPoolRsc',
-                        ConfigPath: [
-                            'connectionPool',
-                        ],
-                    },
-                    {
-                        Title: 'JAAS Mapping',
-                        ReportName: 'mappingModuleRsc',
-                        ConfigPath: [
-                            'mapping',
-                        ],
-                    },
-                    {
-                        Title: 'J2C Authentication Alias',
-                        ReportName: 'jaasAuthDataRsc',
-                        ConfigPath: [
-                            'mapping',
-                        ],
-                        ReportFunc: 'j2cAuthReport',
-                    },
-                ],
-                GenericJMSDestination: [
-                    {
-                        Title: 'JMS Destination',
-                        ReportName: 'genericJMSDestinationRsc',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'JMS Provider',
-                        ReportName: 'jmsProviderRsc',
-                        ConfigPath: [
-                            'provider',
-                        ],
-                    },
-                ],
-                J2CActivationSpec: [
-                    {
-                        Title: 'J2C Activation Specification',
-                        ReportName: 'j2cActivationSpecRsc',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'Activation Specification',
-                        ReportName: 'activationSpecRsc',
-                        ConfigPath: [
-                            'activationSpec',
-                        ],
-                    },
-                ],
-                JAASAuthData: [
-                    {
-                        Title: 'JAAS Alias',
-                        ReportName: 'jaasAuthDataRsc',
-                        ConfigPath: [
-                            '',
-                        ],
-                    },
-                ],
-                URLProvider: [
-                    {
-                        Title: 'URL Provider',
-                        ReportName: 'urlProviderRsc',
-                        ConfigPath: [
-                            '',
-                        ],
-                    },
-                ],
-                URL: [
-                    {
-                        Title: 'URL',
-                        ReportName: 'urlRsc',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'URL Provider',
-                        ReportName: 'urlProviderRsc',
-                        ConfigPath: [
-                            'provider',
-                        ],
-                    },
-                ],
-                J2CConnectionFactory: [
-                    {
-                        Title: 'J2C Connection Factory',
-                        ReportName: 'j2cConnectionFactoryRsc',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'J2C CF Connection Pool',
-                        ReportName: 'connectionPoolRsc',
-                        ConfigPath: [
-                            'connectionPool',
-                        ],
-                    },
-                    {
-                        Title: 'J2C Resource Adapter',
-                        ReportName: 'resourceAdapterRsc',
-                        ConfigPath: [
-                            'provider',
-                        ],
-                    },
-                    {
-                        Title: 'J2C CF Connection Definition',
-                        ReportName: 'j2cConnectionFactoryConDefRsc',
-                        ConfigPath: [
-                            'connectionDefinition',
-                        ],
-                    },
-                ],
-                J2CAdminObject: [
-                    {
-                        Title: 'J2C Admin Object',
-                        ReportName: 'j2cAdminObjectRsc',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'Admin Object',
-                        ReportName: 'adminObjectRsc',
-                        ConfigPath: [
-                            'adminObject',
-                        ],
-                    },
-                ],
-                MQConnectionFactory: [
-                    {
-                        Title: 'MQ Connection Factory',
-                        ReportName: 'mqConnectionFactoryRsc',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'MQ Connection Pool',
-                        ReportName: 'connectionPoolRsc',
-                        ConfigPath: [
-                            'connectionPool',
-                        ],
-                    },
-                    {
-                        Title: 'MQ Session Pool',
-                        ReportName: 'connectionPoolRsc',
-                        ConfigPath: [
-                            'sessionPool',
-                        ],
-                    },
-                    {
-                        Title: 'JAAS Mapping',
-                        ReportName: 'mappingModuleRsc',
-                        ConfigPath: [
-                            'mapping',
-                        ],
-                    },
-                    {
-                        Title: 'MQ Provider',
-                        ReportName: 'jmsProviderRsc',
-                        ConfigPath: [
-                            'provider',
-                        ],
-                    },
-                ],
-                MQQueueConnectionFactory: [
-                    {
-                        Title: 'MQ Queue Connection Factory',
-                        ReportName: 'mqQueueConnectionFactoryRsc',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'MQ Connection Pool',
-                        ReportName: 'connectionPoolRsc',
-                        ConfigPath: [
-                            'connectionPool',
-                        ],
-                    },
-                    {
-                        Title: 'MQ Session Pool',
-                        ReportName: 'connectionPoolRsc',
-                        ConfigPath: [
-                            'sessionPool',
-                        ],
-                    },
-                    {
-                        Title: 'JAAS Mapping',
-                        ReportName: 'mappingModuleRsc',
-                        ConfigPath: [
-                            'mapping',
-                        ],
-                    },
-                    {
-                        Title: 'MQ Provider',
-                        ReportName: 'jmsProviderRsc',
-                        ConfigPath: [
-                            'provider',
-                        ],
-                    },
-                ],
-                MQTopicConnectionFactory: [
-                    {
-                        Title: 'MQ Topic Connection Factory',
-                        ReportName: 'mqTopicConnectionFactoryRsc',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'MQ Connection Pool',
-                        ReportName: 'connectionPoolRsc',
-                        ConfigPath: [
-                            'connectionPool',
-                        ],
-                    },
-                    {
-                        Title: 'MQ Session Pool',
-                        ReportName: 'connectionPoolRsc',
-                        ConfigPath: [
-                            'sessionPool',
-                        ],
-                    },
-                    {
-                        Title: 'JAAS Mapping',
-                        ReportName: 'mappingModuleRsc',
-                        ConfigPath: [
-                            'mapping',
-                        ],
-                    },
-                    {
-                        Title: 'MQ Provider',
-                        ReportName: 'jmsProviderRsc',
-                        ConfigPath: [
-                            'provider',
-                        ],
-                    },
-                ],
-                MQQueue: [
-                    {
-                        Title: 'MQ Queue ',
-                        ReportName: 'mqQueueRsc',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'MQ Provider',
-                        ReportName: 'jmsProviderRsc',
-                        ConfigPath: [
-                            'provider',
-                        ],
-                    },
-                ],
-                MQTopic: [
-                    {
-                        Title: 'MQ Topic ',
-                        ReportName: 'mqTopicRsc',
-                        ConfigPath: [],
-                    },
-                    {
-                        Title: 'MQ Provider',
-                        ReportName: 'jmsProviderRsc',
-                        ConfigPath: [
-                            'provider',
-                        ],
-                    },
-                ],
-            };
-            const resourceTypes = ['DataSource', 'JDBCProvider', 'ObjectCacheInstance', 'ServletCacheInstance', 'SIBus', 'ResourceEnvEntry', 'JMSProvider', 'GenericJMSConnectionFactory', 'GenericJMSDestination', 'J2CActivationSpec', 'URLProvider', 'URL', 'J2CConnectionFactory', 'J2CAdminObject', 'MQConnectionFactory', 'MQQueueConnectionFactory', 'MQTopicConnectionFactory', 'MQQueue', 'MQTopic'];
-            let reportingTable = '';
-            resourceTypes.forEach((resourceType) => {
-                let names = [];
-                names = getUniqueConfigAttrValues(resourceType, getNameAttribute(resourceType), MasterDict);
-                names.forEach((name) => {
-                    let rptParms = {};
-                    const rptTables = [];
-                    const nameAttr = getNameAttribute(resourceType);
-                    const configIDs = findConfigIDs(`.*\\#${resourceType}\\_.*`, true, MasterDict);
-                    const resources = [];
-                    const list = [];
-                    configIDs.forEach((configID) => {
-                        if (MasterDict[configID][nameAttr] === name) {
-                            resources.push(configID);
-                        }
-                    });
-                    resources.forEach((resource) => {
-                        if (MasterDict[resource][nameAttr] === name) {
-                            list.push(resource);
+async function generateResourceReport(MasterDict) {
+    logger_1.logger.debug('Entering to the generateResourceReport function:');
+    try {
+        const PropertiesDict = readProperties();
+        const resourceReportDefinitions = {
+            DataSource: [
+                {
+                    Title: 'Data Source',
+                    ReportName: 'dataSourceRsc',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'Data Source Connection Pool',
+                    ReportName: 'connectionPoolRsc',
+                    ConfigPath: [
+                        'connectionPool',
+                    ],
+                },
+                {
+                    Title: 'Data Source Provider',
+                    ReportName: 'providerReportRsc',
+                    ConfigPath: [
+                        'provider',
+                    ],
+                },
+                {
+                    Title: 'Data Source Relational Resource Adpter',
+                    ReportName: 'resourceAdapterRsc',
+                    ConfigPath: [
+                        'relationalResourceAdapter',
+                    ],
+                },
+                {
+                    Title: 'Data Source Relational Resource Adpter Connector',
+                    ReportName: 'connectorRsc',
+                    ConfigPath: [
+                        'relationalResourceAdapter',
+                        'deploymentDescriptor',
+                    ],
+                },
+            ],
+            J2CResourceAdapter: [
+                {
+                    Title: 'J2C Resource Adapter',
+                    ReportName: 'resourceAdapterRsc',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'J2C Resource Adpter Connector',
+                    ReportName: 'connectorRsc',
+                    ConfigPath: [
+                        'deploymentDescriptor',
+                    ],
+                },
+            ],
+            JDBCProvider: [
+                {
+                    Title: 'JDBC Provider',
+                    ReportName: 'jdbcProviderRsc',
+                    ConfigPath: [
+                        '',
+                    ],
+                },
+            ],
+            SIBus: [
+                {
+                    Title: 'Service Integration Bus',
+                    ReportName: 'sibRsc',
+                    ConfigPath: [
+                        '',
+                    ],
+                },
+            ],
+            ObjectCacheInstance: [
+                {
+                    Title: 'Object Cache',
+                    ReportName: 'objectCacheRsc',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'Cache Provider',
+                    ReportName: 'cacheProviderRsc',
+                    ConfigPath: [
+                        'provider',
+                    ],
+                },
+            ],
+            ServletCacheInstance: [
+                {
+                    Title: 'Servlet Cache',
+                    ReportName: 'objectCacheRsc',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'Cache Provider',
+                    ReportName: 'cacheProviderRsc',
+                    ConfigPath: [
+                        'provider',
+                    ],
+                },
+                {
+                    Title: 'Disk Cache custom Performance Settings',
+                    ReportName: 'diskCacheCustomPerformanceSettingsRsc',
+                    ConfigPath: [
+                        'diskCacheCustomPerformanceSettings',
+                    ],
+                },
+                {
+                    Title: 'Disk Cache Eviction Policy',
+                    ReportName: 'diskCacheEvictionPolicyRsc',
+                    ConfigPath: [
+                        'diskCacheEvictionPolicy',
+                    ],
+                },
+            ],
+            Security: [
+                {
+                    Title: 'Global Security',
+                    ReportName: 'securityRsc',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Inbound',
+                    ReportName: 'csiv2Rsc',
+                    ConfigPath: [
+                        'CSI',
+                        'claims',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Inbound ID assertion',
+                    ReportName: 'csiv2idAssertRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'claims',
+                        'layers->IdentityAssertionLayer_',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Inbound ID assertion QOP',
+                    ReportName: 'csiv2idAssertQOPRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'claims',
+                        'layers->IdentityAssertionLayer_',
+                        'supportedQOP',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Inbound Message',
+                    ReportName: 'csiv2MessageRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'claims',
+                        'layers->MessageLayer_',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Inbound Message supported QOP',
+                    ReportName: 'csiv2MessageQOPRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'claims',
+                        'layers->MessageLayer_',
+                        'supportedQOP',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Inbound Message required QOP',
+                    ReportName: 'csiv2MessageQOPRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'claims',
+                        'layers->MessageLayer_',
+                        'requiredQOP',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Inbound Transport',
+                    ReportName: 'csiv2TransportRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'claims',
+                        'layers->TransportLayer_',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Inbound Transport Server Authentication',
+                    ReportName: 'csiv2TransportSrvSAuthRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'claims',
+                        'layers->TransportLayer_',
+                        'serverAuthentication',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Inbound Transport supported QOP',
+                    ReportName: 'csiv2TransportQOPRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'claims',
+                        'layers->TransportLayer_',
+                        'supportedQOP',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Inbound Transport required QOP',
+                    ReportName: 'csiv2TransportQOPRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'claims',
+                        'layers->TransportLayer_',
+                        'requiredQOP',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Outbound',
+                    ReportName: 'csiv2Rsc',
+                    ConfigPath: [
+                        'CSI',
+                        'performs',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Outbound ID assertion',
+                    ReportName: 'csiv2idAssertRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'performs',
+                        'layers->IdentityAssertionLayer_',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Outbound ID assertion QOP',
+                    ReportName: 'csiv2idAssertQOPRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'performs',
+                        'layers->IdentityAssertionLayer_',
+                        'supportedQOP',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Outbound Message',
+                    ReportName: 'csiv2MessageRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'performs',
+                        'layers->MessageLayer_',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Outbound Message supported QOP',
+                    ReportName: 'csiv2MessageQOPRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'performs',
+                        'layers->MessageLayer_',
+                        'supportedQOP',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Outbound Message required QOP',
+                    ReportName: 'csiv2MessageQOPRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'performs',
+                        'layers->MessageLayer_',
+                        'requiredQOP',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Outbound Transport',
+                    ReportName: 'csiv2TransportRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'performs',
+                        'layers->TransportLayer_',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Outbound Transport Server Authentication',
+                    ReportName: 'csiv2TransportSrvSAuthRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'performs',
+                        'layers->TransportLayer_',
+                        'serverAuthentication',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Outbound Transport supported QOP',
+                    ReportName: 'csiv2TransportQOPRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'performs',
+                        'layers->TransportLayer_',
+                        'supportedQOP',
+                    ],
+                },
+                {
+                    Title: 'Cell Default Common Secure Interoperability (CSI) Outbound Transport required QOP',
+                    ReportName: 'csiv2TransportQOPRsc',
+                    ConfigPath: [
+                        'CSI',
+                        'performs',
+                        'layers->TransportLayer_',
+                        'requiredQOP',
+                    ],
+                },
+                {
+                    Title: 'Certificate Expiration Monitor',
+                    ReportName: 'certExpMonitorRsc',
+                    ConfigPath: [
+                        'wsCertificateExpirationMonitor',
+                    ],
+                },
+                {
+                    Title: 'Certificate Expiration Monitor Notification',
+                    ReportName: 'notificationRsc',
+                    ConfigPath: [
+                        'wsCertificateExpirationMonitor',
+                        'wsNotification',
+                    ],
+                },
+                {
+                    Title: 'Certificate Expiration Monitor Scedule',
+                    ReportName: 'scheduleRsc',
+                    ConfigPath: [
+                        'wsCertificateExpirationMonitor',
+                        'wsSchedule',
+                    ],
+                },
+            ],
+            SSLConfig: [
+                {
+                    Title: 'SSL settings',
+                    ReportName: 'sslConfig1Rsc',
+                    ConfigPath: [
+                        'setting',
+                    ],
+                },
+                {
+                    Title: 'Ciphers',
+                    ReportName: 'ciphers',
+                    ConfigPath: [
+                        'setting',
+                        'trustStore',
+                    ],
+                    ReportFunc: 'ciphersReport',
+                },
+                {
+                    Title: 'Trust Store',
+                    ReportName: 'keyStoreRsc',
+                    ConfigPath: [
+                        'setting',
+                        'trustStore',
+                    ],
+                },
+                {
+                    Title: 'Key Store',
+                    ReportName: 'keyStoreRsc',
+                    ConfigPath: [
+                        'setting',
+                        'keyStore',
+                    ],
+                },
+                {
+                    Title: 'Trust Manager',
+                    ReportName: 'trustManagerRsc',
+                    ConfigPath: [
+                        'setting',
+                        'trustManager',
+                    ],
+                },
+                {
+                    Title: 'Key Manager',
+                    ReportName: 'keyManagerRsc',
+                    ConfigPath: [
+                        'setting',
+                        'keyManager',
+                    ],
+                },
+            ],
+            ResourceEnvironmentProvider: [
+                {
+                    Title: 'Resource Environment Provider',
+                    ReportName: 'rscEnvProviderRsc',
+                    ConfigPath: [
+                        '',
+                    ],
+                },
+            ],
+            ResourceEnvEntry: [
+                {
+                    Title: 'Resource Environment Entry',
+                    ReportName: 'rscEnvEntryRsc',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'Referencable',
+                    ReportName: 'referencableRsc',
+                    ConfigPath: [
+                        'referenceable',
+                    ],
+                },
+                {
+                    Title: 'Resource Environment Provider',
+                    ReportName: 'rscEnvProviderRsc',
+                    ConfigPath: [
+                        'provider',
+                    ],
+                },
+            ],
+            Application: [
+                {
+                    Title: 'Application Deployment',
+                    ReportName: 'applicationDeployment',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'Application Deployment Classloader',
+                    ReportName: 'applicationClassloader',
+                    ConfigPath: [
+                        'classloader',
+                    ],
+                },
+            ],
+            ApplicationModules: [
+                {
+                    Title: 'Application Module',
+                    ReportName: 'applicationDeployment',
+                    ConfigPath: [
+                        'modules',
+                    ],
+                },
+            ],
+            JMSProvider: [
+                {
+                    Title: 'JMS Provider',
+                    ReportName: 'jmsProviderRsc',
+                    ConfigPath: [
+                        '',
+                    ],
+                },
+            ],
+            GenericJMSConnectionFactory: [
+                {
+                    Title: 'JMS Connection Factory',
+                    ReportName: 'genericJMSConnectionFactoryRsc',
+                    ConfigPath: [
+                        '',
+                    ],
+                },
+                {
+                    Title: 'Session Pool',
+                    ReportName: 'connectionPoolRsc',
+                    ConfigPath: [
+                        'sessionPool',
+                    ],
+                },
+                {
+                    Title: 'JMS Provider',
+                    ReportName: 'jmsProviderRsc',
+                    ConfigPath: [
+                        'provider',
+                    ],
+                },
+                {
+                    Title: 'Connection Pool',
+                    ReportName: 'connectionPoolRsc',
+                    ConfigPath: [
+                        'connectionPool',
+                    ],
+                },
+                {
+                    Title: 'JAAS Mapping',
+                    ReportName: 'mappingModuleRsc',
+                    ConfigPath: [
+                        'mapping',
+                    ],
+                },
+                {
+                    Title: 'J2C Authentication Alias',
+                    ReportName: 'jaasAuthDataRsc',
+                    ConfigPath: [
+                        'mapping',
+                    ],
+                    ReportFunc: 'j2cAuthReport',
+                },
+            ],
+            GenericJMSDestination: [
+                {
+                    Title: 'JMS Destination',
+                    ReportName: 'genericJMSDestinationRsc',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'JMS Provider',
+                    ReportName: 'jmsProviderRsc',
+                    ConfigPath: [
+                        'provider',
+                    ],
+                },
+            ],
+            J2CActivationSpec: [
+                {
+                    Title: 'J2C Activation Specification',
+                    ReportName: 'j2cActivationSpecRsc',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'Activation Specification',
+                    ReportName: 'activationSpecRsc',
+                    ConfigPath: [
+                        'activationSpec',
+                    ],
+                },
+            ],
+            JAASAuthData: [
+                {
+                    Title: 'JAAS Alias',
+                    ReportName: 'jaasAuthDataRsc',
+                    ConfigPath: [
+                        '',
+                    ],
+                },
+            ],
+            URLProvider: [
+                {
+                    Title: 'URL Provider',
+                    ReportName: 'urlProviderRsc',
+                    ConfigPath: [
+                        '',
+                    ],
+                },
+            ],
+            URL: [
+                {
+                    Title: 'URL',
+                    ReportName: 'urlRsc',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'URL Provider',
+                    ReportName: 'urlProviderRsc',
+                    ConfigPath: [
+                        'provider',
+                    ],
+                },
+            ],
+            J2CConnectionFactory: [
+                {
+                    Title: 'J2C Connection Factory',
+                    ReportName: 'j2cConnectionFactoryRsc',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'J2C CF Connection Pool',
+                    ReportName: 'connectionPoolRsc',
+                    ConfigPath: [
+                        'connectionPool',
+                    ],
+                },
+                {
+                    Title: 'J2C Resource Adapter',
+                    ReportName: 'resourceAdapterRsc',
+                    ConfigPath: [
+                        'provider',
+                    ],
+                },
+                {
+                    Title: 'J2C CF Connection Definition',
+                    ReportName: 'j2cConnectionFactoryConDefRsc',
+                    ConfigPath: [
+                        'connectionDefinition',
+                    ],
+                },
+            ],
+            J2CAdminObject: [
+                {
+                    Title: 'J2C Admin Object',
+                    ReportName: 'j2cAdminObjectRsc',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'Admin Object',
+                    ReportName: 'adminObjectRsc',
+                    ConfigPath: [
+                        'adminObject',
+                    ],
+                },
+            ],
+            MQConnectionFactory: [
+                {
+                    Title: 'MQ Connection Factory',
+                    ReportName: 'mqConnectionFactoryRsc',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'MQ Connection Pool',
+                    ReportName: 'connectionPoolRsc',
+                    ConfigPath: [
+                        'connectionPool',
+                    ],
+                },
+                {
+                    Title: 'MQ Session Pool',
+                    ReportName: 'connectionPoolRsc',
+                    ConfigPath: [
+                        'sessionPool',
+                    ],
+                },
+                {
+                    Title: 'JAAS Mapping',
+                    ReportName: 'mappingModuleRsc',
+                    ConfigPath: [
+                        'mapping',
+                    ],
+                },
+                {
+                    Title: 'MQ Provider',
+                    ReportName: 'jmsProviderRsc',
+                    ConfigPath: [
+                        'provider',
+                    ],
+                },
+            ],
+            MQQueueConnectionFactory: [
+                {
+                    Title: 'MQ Queue Connection Factory',
+                    ReportName: 'mqQueueConnectionFactoryRsc',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'MQ Connection Pool',
+                    ReportName: 'connectionPoolRsc',
+                    ConfigPath: [
+                        'connectionPool',
+                    ],
+                },
+                {
+                    Title: 'MQ Session Pool',
+                    ReportName: 'connectionPoolRsc',
+                    ConfigPath: [
+                        'sessionPool',
+                    ],
+                },
+                {
+                    Title: 'JAAS Mapping',
+                    ReportName: 'mappingModuleRsc',
+                    ConfigPath: [
+                        'mapping',
+                    ],
+                },
+                {
+                    Title: 'MQ Provider',
+                    ReportName: 'jmsProviderRsc',
+                    ConfigPath: [
+                        'provider',
+                    ],
+                },
+            ],
+            MQTopicConnectionFactory: [
+                {
+                    Title: 'MQ Topic Connection Factory',
+                    ReportName: 'mqTopicConnectionFactoryRsc',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'MQ Connection Pool',
+                    ReportName: 'connectionPoolRsc',
+                    ConfigPath: [
+                        'connectionPool',
+                    ],
+                },
+                {
+                    Title: 'MQ Session Pool',
+                    ReportName: 'connectionPoolRsc',
+                    ConfigPath: [
+                        'sessionPool',
+                    ],
+                },
+                {
+                    Title: 'JAAS Mapping',
+                    ReportName: 'mappingModuleRsc',
+                    ConfigPath: [
+                        'mapping',
+                    ],
+                },
+                {
+                    Title: 'MQ Provider',
+                    ReportName: 'jmsProviderRsc',
+                    ConfigPath: [
+                        'provider',
+                    ],
+                },
+            ],
+            MQQueue: [
+                {
+                    Title: 'MQ Queue ',
+                    ReportName: 'mqQueueRsc',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'MQ Provider',
+                    ReportName: 'jmsProviderRsc',
+                    ConfigPath: [
+                        'provider',
+                    ],
+                },
+            ],
+            MQTopic: [
+                {
+                    Title: 'MQ Topic ',
+                    ReportName: 'mqTopicRsc',
+                    ConfigPath: [],
+                },
+                {
+                    Title: 'MQ Provider',
+                    ReportName: 'jmsProviderRsc',
+                    ConfigPath: [
+                        'provider',
+                    ],
+                },
+            ],
+        };
+        const resourceTypes = ['DataSource', 'JDBCProvider', 'ObjectCacheInstance', 'ServletCacheInstance', 'SIBus', 'ResourceEnvEntry', 'JMSProvider', 'GenericJMSConnectionFactory', 'GenericJMSDestination', 'J2CActivationSpec', 'URLProvider', 'URL', 'J2CConnectionFactory', 'J2CAdminObject', 'MQConnectionFactory', 'MQQueueConnectionFactory', 'MQTopicConnectionFactory', 'MQQueue', 'MQTopic'];
+        let reportingTable = '';
+        resourceTypes.forEach((resourceType) => {
+            let names = [];
+            names = getUniqueConfigAttrValues(resourceType, getNameAttribute(resourceType), MasterDict);
+            names.forEach((name) => {
+                let rptParms = {};
+                const rptTables = [];
+                const nameAttr = getNameAttribute(resourceType);
+                const configIDs = findConfigIDs(`.*\\#${resourceType}\\_.*`, true, MasterDict);
+                const resources = [];
+                const list = [];
+                configIDs.forEach((configID) => {
+                    if (MasterDict[configID][nameAttr] === name) {
+                        resources.push(configID);
+                    }
+                });
+                resources.forEach((resource) => {
+                    if (MasterDict[resource][nameAttr] === name) {
+                        list.push(resource);
+                    }
+                });
+                rptParms = { ServerList: list };
+                resourceReportDefinitions[resourceType].forEach((resourceReport) => {
+                    const rscRptTitle = `${resourceReport.Title}(${name})`;
+                    Object.assign(rptParms, { Title: rscRptTitle, ConfigPath: resourceReport.ConfigPath, ReportName: resourceReport.ReportName });
+                    if (PropertiesDict[`${resourceReport.ReportName}:attributes`] !== undefined) {
+                        Object.assign(rptParms, { Attributes: PropertiesDict[`${resourceReport.ReportName}:attributes`].split(',') });
+                    }
+                    const columnHeaders = [];
+                    const initialConfigIDs = [];
+                    const tableData = [];
+                    const rowHeaders = [];
+                    rptParms.ServerList.forEach((server) => {
+                        if (rptParms.ColumnHeaderFunc === undefined) {
+                            columnHeaders.push((MasterDict[server].name).concat(' (', getConfigIDNode(server), ', ', getConfigIDCell(server), ')'));
                         }
                     });
-                    rptParms = { ServerList: list };
-                    resourceReportDefinitions[resourceType].forEach((resourceReport) => {
-                        const rscRptTitle = `${resourceReport.Title}(${name})`;
-                        Object.assign(rptParms, { Title: rscRptTitle, ConfigPath: resourceReport.ConfigPath, ReportName: resourceReport.ReportName });
-                        if (PropertiesDict[`${resourceReport.ReportName}:attributes`] !== undefined) {
-                            Object.assign(rptParms, { Attributes: PropertiesDict[`${resourceReport.ReportName}:attributes`].split(',') });
-                        }
-                        const columnHeaders = [];
-                        const initialConfigIDs = [];
-                        const tableData = [];
-                        const rowHeaders = [];
+                    rptParms.Attributes.forEach((attribute) => {
+                        const attributeValues = [];
                         rptParms.ServerList.forEach((server) => {
-                            if (rptParms.ColumnHeaderFunc === undefined) {
-                                columnHeaders.push((MasterDict[server].name).concat(' (', getConfigIDNode(server), ', ', getConfigIDCell(server), ')'));
-                            }
-                        });
-                        rptParms.Attributes.forEach((attribute) => {
-                            const attributeValues = [];
-                            rptParms.ServerList.forEach((server) => {
-                                let config = {};
-                                try {
-                                    const pathElements = [];
-                                    pathElements.push(server);
-                                    if ((rptParms.ConfigPath).length > 0) {
-                                        rptParms.ConfigPath.forEach((ConfigPath) => {
-                                            pathElements.push(ConfigPath);
-                                        });
-                                    }
-                                    pathElements.forEach((pathElement) => {
-                                        if (isConfigID(pathElement)) {
-                                            if (MasterDict[pathElement] !== undefined) {
-                                                config = MasterDict[pathElement];
-                                            }
-                                        }
-                                        else if (MasterDict[config[pathElement]] !== undefined) {
-                                            config = MasterDict[config[pathElement]];
-                                        }
-                                    });
-                                    if (config !== undefined) {
-                                        if (initialConfigIDs.hasOwnProperty(config.CONFIG_ID)) {
-                                            initialConfigIDs.push(config.CONFIG_ID);
-                                        }
-                                    }
-                                }
-                                catch (error) {
-                                    logger_1.logger.debug('error %s', error.message);
-                                }
-                                const keys = Object.keys(config);
-                                if (keys.length === 0) {
-                                    attributeValues.push('configuration not defined');
-                                }
-                                else {
-                                    keys.forEach((key) => {
-                                        if (attribute === key) {
-                                            attributeValues.push(config[attribute]);
-                                        }
+                            let config = {};
+                            try {
+                                const pathElements = [];
+                                pathElements.push(server);
+                                if ((rptParms.ConfigPath).length > 0) {
+                                    rptParms.ConfigPath.forEach((ConfigPath) => {
+                                        pathElements.push(ConfigPath);
                                     });
                                 }
-                            });
-                            let attrSet = 'false';
-                            const BreakException = {};
-                            try {
-                                if (attributeValues.length !== 0) {
-                                    attributeValues.forEach((attValue) => {
-                                        if (attValue.indexOf(' not ') === -1) {
-                                            attrSet = 'true';
-                                            throw BreakException;
+                                pathElements.forEach((pathElement) => {
+                                    if (isConfigID(pathElement)) {
+                                        if (MasterDict[pathElement] !== undefined) {
+                                            config = MasterDict[pathElement];
                                         }
-                                    });
+                                    }
+                                    else if (MasterDict[config[pathElement]] !== undefined) {
+                                        config = MasterDict[config[pathElement]];
+                                    }
+                                });
+                                if (config !== undefined) {
+                                    if (initialConfigIDs.hasOwnProperty(config.CONFIG_ID)) {
+                                        initialConfigIDs.push(config.CONFIG_ID);
+                                    }
                                 }
                             }
-                            catch (e) {
-                                if (e !== BreakException)
-                                    throw e;
+                            catch (error) {
+                                logger_1.logger.debug('error %s', error.message);
                             }
-                            if (attrSet === 'true') {
-                                rowHeaders.push(attribute);
-                                tableData.push(attributeValues);
+                            const keys = Object.keys(config);
+                            if (keys.length === 0) {
+                                attributeValues.push('configuration not defined');
                             }
-                        });
-                        const attributeDict = {
-                            RowHeaders: rowHeaders, TableData: tableData, Title: rptParms.Title, FirstColumnHeader: 'Attribute', ConfigIDs: initialConfigIDs, Type: 'Attributes',
-                        };
-                        Object.assign(rptParms, { ColumnHeaders: columnHeaders });
-                        rptTables.push(attributeDict);
-                        Object.assign(rptParms, { Tables: rptTables });
-                        const PropertyAttributes = [{ PropName: 'properties', PropPath: [] },
-                            { PropName: 'customProperties', PropPath: [] },
-                            { PropName: 'systemProperties', PropPath: [] },
-                            { PropName: 'environment', PropPath: [] },
-                            { PropName: 'properties', PropPath: ['adminObjectTemplateProps'] },
-                            { PropName: 'additionalTrustManagerAttrs', PropPath: [] },
-                            { PropName: 'webAuthAttrs', PropPath: [] },
-                            { PropName: 'trustProperties', PropPath: [] }, { PropName: 'resourceProperties', PropPath: ['connectionDefTemplateProps', 'resourceProperties'] },
-                            { PropName: 'resourceProperties', PropPath: ['propertySet'] },
-                            { PropName: 'resourceProperties', PropPath: ['activationSpecTemplateProps'] },
-                        ];
-                        const clusterDict = {};
-                        const initialconfigIDs = [];
-                        PropertyAttributes.forEach((propAttr) => {
-                            const propNames = [];
-                            rptParms.ServerList.forEach((server) => {
-                                const serverDict = {};
-                                let config = {};
-                                try {
-                                    const pathElements = [];
-                                    pathElements.push(server);
-                                    if ((rptParms.ConfigPath).length > 0) {
-                                        rptParms.ConfigPath.forEach((ConfigPath) => {
-                                            pathElements.push(ConfigPath);
-                                        });
+                            else {
+                                keys.forEach((key) => {
+                                    if (attribute === key) {
+                                        attributeValues.push(config[attribute]);
                                     }
-                                    if ((propAttr.PropPath).length > 0) {
-                                        propAttr.PropPath.forEach((PropPath) => {
-                                            pathElements.push(PropPath);
-                                        });
+                                });
+                            }
+                        });
+                        let attrSet = 'false';
+                        const BreakException = {};
+                        try {
+                            if (attributeValues.length !== 0) {
+                                attributeValues.forEach((attValue) => {
+                                    if (attValue.indexOf(' not ') === -1) {
+                                        attrSet = 'true';
+                                        throw BreakException;
                                     }
-                                    pathElements.forEach((pathElement) => {
-                                        if (isConfigID(pathElement)) {
-                                            if (MasterDict[pathElement] !== undefined) {
-                                                config = MasterDict[pathElement];
-                                            }
-                                        }
-                                        else if (MasterDict[config[pathElement]] !== undefined) {
-                                            config = MasterDict[config[pathElement]];
-                                        }
+                                });
+                            }
+                        }
+                        catch (e) {
+                            if (e !== BreakException)
+                                throw e;
+                        }
+                        if (attrSet === 'true') {
+                            rowHeaders.push(attribute);
+                            tableData.push(attributeValues);
+                        }
+                    });
+                    const attributeDict = {
+                        RowHeaders: rowHeaders, TableData: tableData, Title: rptParms.Title, FirstColumnHeader: 'Attribute', ConfigIDs: initialConfigIDs, Type: 'Attributes',
+                    };
+                    Object.assign(rptParms, { ColumnHeaders: columnHeaders });
+                    rptTables.push(attributeDict);
+                    Object.assign(rptParms, { Tables: rptTables });
+                    const PropertyAttributes = [{ PropName: 'properties', PropPath: [] },
+                        { PropName: 'customProperties', PropPath: [] },
+                        { PropName: 'systemProperties', PropPath: [] },
+                        { PropName: 'environment', PropPath: [] },
+                        { PropName: 'properties', PropPath: ['adminObjectTemplateProps'] },
+                        { PropName: 'additionalTrustManagerAttrs', PropPath: [] },
+                        { PropName: 'webAuthAttrs', PropPath: [] },
+                        { PropName: 'trustProperties', PropPath: [] }, { PropName: 'resourceProperties', PropPath: ['connectionDefTemplateProps', 'resourceProperties'] },
+                        { PropName: 'resourceProperties', PropPath: ['propertySet'] },
+                        { PropName: 'resourceProperties', PropPath: ['activationSpecTemplateProps'] },
+                    ];
+                    const clusterDict = {};
+                    const initialconfigIDs = [];
+                    PropertyAttributes.forEach((propAttr) => {
+                        const propNames = [];
+                        rptParms.ServerList.forEach((server) => {
+                            const serverDict = {};
+                            let config = {};
+                            try {
+                                const pathElements = [];
+                                pathElements.push(server);
+                                if ((rptParms.ConfigPath).length > 0) {
+                                    rptParms.ConfigPath.forEach((ConfigPath) => {
+                                        pathElements.push(ConfigPath);
                                     });
                                 }
-                                catch (error) {
-                                    logger_1.logger.debug('error %s', error.message);
+                                if ((propAttr.PropPath).length > 0) {
+                                    propAttr.PropPath.forEach((PropPath) => {
+                                        pathElements.push(PropPath);
+                                    });
                                 }
-                                let props = config[propAttr.PropName];
-                                if (props !== undefined && props.length > 0) {
-                                    if (isConfigID(props)) {
-                                        props = props.slice(1, -1).split(' ');
-                                        props.forEach((prop) => {
-                                            let found = false;
-                                            propNames.forEach((propname) => {
-                                                if (propname === MasterDict[prop].name) {
-                                                    found = true;
-                                                }
-                                            });
-                                            let value = '';
-                                            if (!found) {
-                                                propNames.push(MasterDict[prop].name);
-                                            }
-                                            if (MasterDict[prop].value !== undefined) {
-                                                value = MasterDict[prop].value;
-                                            }
-                                            else {
-                                                value = 'present but null';
-                                            }
-                                            Object.assign(serverDict, { [MasterDict[prop].name]: value });
-                                            if (MasterDict[prop].CONFIG_ID !== undefined) {
-                                                initialconfigIDs.push(MasterDict[prop].CONFIG_ID);
+                                pathElements.forEach((pathElement) => {
+                                    if (isConfigID(pathElement)) {
+                                        if (MasterDict[pathElement] !== undefined) {
+                                            config = MasterDict[pathElement];
+                                        }
+                                    }
+                                    else if (MasterDict[config[pathElement]] !== undefined) {
+                                        config = MasterDict[config[pathElement]];
+                                    }
+                                });
+                            }
+                            catch (error) {
+                                logger_1.logger.debug('error %s', error.message);
+                            }
+                            let props = config[propAttr.PropName];
+                            if (props !== undefined && props.length > 0) {
+                                if (isConfigID(props)) {
+                                    props = props.slice(1, -1).split(' ');
+                                    props.forEach((prop) => {
+                                        let found = false;
+                                        propNames.forEach((propname) => {
+                                            if (propname === MasterDict[prop].name) {
+                                                found = true;
                                             }
                                         });
-                                    }
-                                    Object.assign(clusterDict, { [server]: serverDict });
-                                }
-                            });
-                            if (propNames.length > 0) {
-                                propNames.sort();
-                                const propertyTableData = [];
-                                propNames.forEach((propName) => {
-                                    let row = [];
-                                    rptParms.ServerList.forEach((server) => {
-                                        if (server === 'NOT_FOUND') {
-                                            row = 'Interceptor not configured in domain';
+                                        let value = '';
+                                        if (!found) {
+                                            propNames.push(MasterDict[prop].name);
                                         }
-                                        else if (clusterDict[server][propName] !== undefined) {
-                                            row = clusterDict[server][propName];
+                                        if (MasterDict[prop].value !== undefined) {
+                                            value = MasterDict[prop].value;
                                         }
                                         else {
-                                            row = 'Property not set';
+                                            value = 'present but null';
+                                        }
+                                        Object.assign(serverDict, { [MasterDict[prop].name]: value });
+                                        if (MasterDict[prop].CONFIG_ID !== undefined) {
+                                            initialconfigIDs.push(MasterDict[prop].CONFIG_ID);
                                         }
                                     });
-                                    propertyTableData.push(row);
-                                });
-                                const propsDict = {
-                                    RowHeaders: propNames,
-                                    TableData: propertyTableData,
-                                    Title: `${propAttr.PropName} for ${rptParms.Title}`,
-                                    FirstColumnHeader: propAttr.PropName,
-                                    ConfigIDs: initialconfigIDs,
-                                    Type: 'Properties',
-                                };
-                                rptTables.push(propsDict);
-                                Object.assign(rptParms, { Tables: rptTables });
+                                }
+                                Object.assign(clusterDict, { [server]: serverDict });
                             }
                         });
+                        if (propNames.length > 0) {
+                            propNames.sort();
+                            const propertyTableData = [];
+                            propNames.forEach((propName) => {
+                                let row = [];
+                                rptParms.ServerList.forEach((server) => {
+                                    if (server === 'NOT_FOUND') {
+                                        row = 'Interceptor not configured in domain';
+                                    }
+                                    else if (clusterDict[server][propName] !== undefined) {
+                                        row = clusterDict[server][propName];
+                                    }
+                                    else {
+                                        row = 'Property not set';
+                                    }
+                                });
+                                propertyTableData.push(row);
+                            });
+                            const propsDict = {
+                                RowHeaders: propNames,
+                                TableData: propertyTableData,
+                                Title: `${propAttr.PropName} for ${rptParms.Title}`,
+                                FirstColumnHeader: propAttr.PropName,
+                                ConfigIDs: initialconfigIDs,
+                                Type: 'Properties',
+                            };
+                            rptTables.push(propsDict);
+                            Object.assign(rptParms, { Tables: rptTables });
+                        }
                     });
-                    let tbody = '';
-                    const reportTables = rptParms.Tables;
-                    const colHeaders = rptParms.ColumnHeaders;
-                    reportingTable = `${reportingTable}<table style="table-layout:fixed" border="2" cellpadding="2" cellspacing="0" width=554>`;
-                    reportTables.forEach((table) => {
-                        const firstColumnHeader = table.FirstColumnHeader;
-                        const rowHeadersData = table.RowHeaders;
-                        const reportTableData = table.TableData;
-                        const title = table.Title;
-                        tbody = `${tbody}<tbody>`;
-                        tbody = `${tbody}<tr align="left"><td colspan="3" rowspan="1" bgcolor="#999999" valign="top"><big><big><b>${title}</b></big></big><br></td></tr>`;
-                        tbody = `${tbody}<tr><td class="wrapped" valign="top"><b>${firstColumnHeader}</b><b><br></b> </td>`;
-                        colHeaders.forEach((header) => {
-                            tbody = `${tbody}<td class="wrapped" bgcolor="#cccccc" valign="top"><b>${header}</b><b><br></b> </td>`;
-                        });
-                        tbody = `${tbody}<tr>`;
-                        let idx = 0;
-                        rowHeadersData.forEach((rowHeaderData) => {
-                            tbody = `${tbody}<tr><td class="wrapped" bgcolor="#cccccc" valign="top"><b>${rowHeadersData[idx]}</b><b><br></b> </td>`;
-                            tbody = `${tbody}<td class="wrapped" valign="top">${reportTableData[idx]}<br></td>`;
-                            tbody = `${tbody}</tr>`;
-                            idx += 1;
-                        });
-                        tbody = `${tbody}</tbody>`;
+                });
+                let tbody = '';
+                const reportTables = rptParms.Tables;
+                const colHeaders = rptParms.ColumnHeaders;
+                reportingTable = `${reportingTable}<table style="table-layout:fixed" border="2" cellpadding="2" cellspacing="0" width=554>`;
+                reportTables.forEach((table) => {
+                    const firstColumnHeader = table.FirstColumnHeader;
+                    const rowHeadersData = table.RowHeaders;
+                    const reportTableData = table.TableData;
+                    const title = table.Title;
+                    tbody = `${tbody}<tbody>`;
+                    tbody = `${tbody}<tr align="left"><td colspan="3" rowspan="1" bgcolor="#999999" valign="top"><big><big><b>${title}</b></big></big><br></td></tr>`;
+                    tbody = `${tbody}<tr><td class="wrapped" valign="top"><b>${firstColumnHeader}</b><b><br></b> </td>`;
+                    colHeaders.forEach((header) => {
+                        tbody = `${tbody}<td class="wrapped" bgcolor="#cccccc" valign="top"><b>${header}</b><b><br></b> </td>`;
+                    });
+                    tbody = `${tbody}<tr>`;
+                    let idx = 0;
+                    rowHeadersData.forEach((rowHeaderData) => {
+                        tbody = `${tbody}<tr><td class="wrapped" bgcolor="#cccccc" valign="top"><b>${rowHeadersData[idx]}</b><b><br></b> </td>`;
+                        tbody = `${tbody}<td class="wrapped" valign="top">${reportTableData[idx]}<br></td>`;
+                        tbody = `${tbody}</tr>`;
+                        idx += 1;
                     });
-                    reportingTable = `${reportingTable}${tbody}</table></br>`;
+                    tbody = `${tbody}</tbody>`;
                 });
+                reportingTable = `${reportingTable}${tbody}</table></br>`;
             });
-            const resourceReport = `
+        });
+        const resourceReport = `
       <!DOCTYPE html>
       <html>\n<head>\n<meta http-equiv="content-type" content="text/html; charset=UTF-8">\n<title>Cell Summary Report</title>\n</head>\n<body>
       <head><style type="text/css">
@@ -1482,7 +1470,7 @@ function generateResourceReport(MasterDict) {
       </style>
       </head>
       <body>
-      <div><h1>Resources Report ${moment_1.default().format('MM/DD/YY h:mm:ss')}</h1>
+      <div><h1>Resources Report ${(0, moment_1.default)().format('MM/DD/YY h:mm:ss')}</h1>
       <div class="Div1">
       <svg width="20" height="20">
       <rect width="20" height="20" style="fill:#87CEEB;stroke-width:3;stroke:rgb(0,0,0)" />
@@ -1537,23 +1525,22 @@ function generateResourceReport(MasterDict) {
       </script>  
       </body>
       </html>`;
-            try {
-                const outputFileName = utils_1.getFileNameWithTimeStamp(constants_1.CONSTANT_VALUES.resourceReport);
-                const outputFileLocation = `${path_1.default.resolve(utils_1.getStoreDir(), constants_1.CONSTANT_VALUES.outputFileLocation)}/${constants_1.CONSTANT_VALUES.reportCFG}`;
-                const writeFileResponse = yield filesServices_1.fileServices.writeFile(resourceReport, outputFileLocation, `${outputFileName}.${constants_1.FileType.HTML}`);
-                logger_1.logger.info(utils_1.message('EXPORT_RESOURCE_REPORT_SUCCESS', { 0: writeFileResponse }));
-            }
-            catch (error) {
-                logger_1.logger.debug('Error in writing file %o', error);
-                return false;
-            }
+        try {
+            const outputFileName = (0, utils_1.getFileNameWithTimeStamp)(constants_1.CONSTANT_VALUES.resourceReport);
+            const outputFileLocation = `${path_1.default.resolve((0, utils_1.getStoreDir)(), constants_1.CONSTANT_VALUES.outputFileLocation)}/${constants_1.CONSTANT_VALUES.reportCFG}`;
+            const writeFileResponse = await filesServices_1.fileServices.writeFile(resourceReport, outputFileLocation, `${outputFileName}.${constants_1.FileType.HTML}`);
+            logger_1.logger.info((0, utils_1.message)('EXPORT_RESOURCE_REPORT_SUCCESS', { 0: writeFileResponse }));
         }
         catch (error) {
-            logger_1.logger.debug('Error in generating resource report %s', error.message);
+            logger_1.logger.debug('Error in writing file %o', error);
             return false;
         }
-        return true;
-    });
+    }
+    catch (error) {
+        logger_1.logger.debug('Error in generating resource report %s', error.message);
+        return false;
+    }
+    return true;
 }
 exports.differentialReportUtils = {
     readConfigs,