fix 834 and 826 (#864)

Author: CarolynRountree

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSSystemResource.json

@@ -510,8 +510,8 @@
                                     "ExactlyOnceLoadBalancingPolicy": [ {"version": "[12.2.1.4,)",    "wlst_mode": "both", "wlst_name": "ExactlyOnceLoadBalancingPolicy", "wlst_path": "WP001", "value": {"default": "${None:Per-Member}"   }, "wlst_type": "string",  "restart_required": "true"} ],
                                     "JNDIPrefix":                     [ {"version": "[10,)",          "wlst_mode": "both", "wlst_name": "JNDIPrefix",                     "wlst_path": "WP001", "value": {"default": "None"                 }, "wlst_type": "string"   } ],
                                     "Notes":                          [ {"version": "[10,)",          "wlst_mode": "both", "wlst_name": "Notes",                          "wlst_path": "WP001", "value": {"default": "None"                 }, "wlst_type": "string"   } ],
-                                    "SAFErrorHandling":               [ {"version": "[10,)",          "wlst_mode": "both", "wlst_name": "SAFErrorHandling",               "wlst_path": "WP001", "value": {"default": "None"                 }, "wlst_type": "string",  "get_method": "LSA", "set_method": "MBEAN.set_saf_error_handling_mbean", "set_mbean_type": "weblogic.j2ee.descriptor.wl.SAFErrorHandlingBean", "restart_required": "true" } ],
-                                    "SAFRemoteContext":               [ {"version": "[10,)",          "wlst_mode": "both", "wlst_name": "SAFRemoteContext",               "wlst_path": "WP001", "value": {"default": "None"                 }, "wlst_type": "string",  "get_method": "LSA", "set_method": "MBEAN.set_saf_remote_context_mbean", "set_mbean_type": "weblogic.j2ee.descriptor.wl.SAFRemoteContextBean"} ],
+                                    "SAFErrorHandling":               [ {"version": "[10,)",          "wlst_mode": "both", "wlst_name": "SAFErrorHandling",               "wlst_path": "WP001", "value": {"default": "None"                 }, "wlst_type": "string",  "get_method": "${LSA:GET}", "set_method": "MBEAN.set_saf_error_handling_mbean", "set_mbean_type": "weblogic.j2ee.descriptor.wl.SAFErrorHandlingBean", "restart_required": "true" } ],
+                                    "SAFRemoteContext":               [ {"version": "[10,)",          "wlst_mode": "both", "wlst_name": "SAFRemoteContext",               "wlst_path": "WP001", "value": {"default": "None"                 }, "wlst_type": "string",  "get_method": "${LSA:GET}", "set_method": "MBEAN.set_saf_remote_context_mbean", "set_mbean_type": "weblogic.j2ee.descriptor.wl.SAFRemoteContextBean"} ],
                                     "SubDeploymentName":              [ {"version": "[10,)",          "wlst_mode": "both", "wlst_name": "SubDeploymentName",              "wlst_path": "WP001", "value": {"default": "None"                 }, "wlst_type": "string",  "restart_required": "true" } ],
                                     "TimeToLiveDefault":              [ {"version": "[10,)",          "wlst_mode": "both", "wlst_name": "TimeToLiveDefault",              "wlst_path": "WP001", "value": {"default": "${0:3600000}"         }, "wlst_type": "long"     } ],
                                     "UnitOfOrderRouting":             [ {"version": "[10,12.2.1.2)",  "wlst_mode": "both", "wlst_name": "UnitOfOrderRouting",             "wlst_path": "WP001", "value": {"default": "Hash"                 }, "wlst_type": "string",  "get_method": "LSA", "restart_required": "true" } ,

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json

@@ -1113,7 +1113,7 @@
                 "ConnectionCachingPolicy":              [ {"version": "[12.2.1.1,)", "wlst_mode": "both",    "wlst_name": "ConnectionCachingPolicy",            "wlst_path": "WP001", "value": {"default": "${None:DEFAULT}" },"wlst_type": "string","restart_required": "true" } ],
                 "ConnectionPool":                       [ {"version": "[12.1.2,12.2.1)", "wlst_mode": "offline", "wlst_name": "ConnectionPool",                 "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string"           } ],
                 "CreateTableDDLFile":                   [ {"version": "[12.1.2,)",   "wlst_mode": "both",    "wlst_name": "CreateTableDDLFile",                 "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string",          "restart_required": "true" } ],
-                "DataSource":                           [ {"version": "[12.1.2,)",   "wlst_mode": "both",    "wlst_name": "DataSource",                         "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string",          "set_method": "${:MBEAN.set_data_source_mbean}", "set_mbean_type": "${:weblogic.management.configuration.JDBCSystemResourceMBean}", "restart_required": "true" } ],
+                "DataSource":                           [ {"version": "[12.1.2,)",   "wlst_mode": "both",    "wlst_name": "DataSource",                         "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string",          "get_method": "${LSA:GET}", "set_method": "${:MBEAN.set_data_source_mbean}", "set_mbean_type": "${:weblogic.management.configuration.JDBCSystemResourceMBean}", "restart_required": "true" } ],
                 "DeletesPerBatchMaximum":               [ {"version": "[12.1.2,)",   "wlst_mode": "both",    "wlst_name": "DeletesPerBatchMaximum",             "wlst_path": "WP001", "value": {"default": 20     }, "wlst_type": "integer",         "restart_required": "true" } ],
                 "DeletesPerStatementMaximum":           [ {"version": "[12.1.2,)",   "wlst_mode": "both",    "wlst_name": "DeletesPerStatementMaximum",         "wlst_path": "WP001", "value": {"default": 20     }, "wlst_type": "integer",         "restart_required": "true" } ],
                 "DeploymentOrder":                      [ {"version": "[12.1.2,)",   "wlst_mode": "both",    "wlst_name": "DeploymentOrder",                    "wlst_path": "WP001", "value": {"default": 1000   }, "wlst_type": "integer"          } ],