Storm app package changes to fix the jmx property names and default yarn.memory values
diff --git a/app-packages/hbase-win/appConfig-default.json b/app-packages/hbase-win/appConfig-default.json
index 80d20af..04cb9a9 100644
--- a/app-packages/hbase-win/appConfig-default.json
+++ b/app-packages/hbase-win/appConfig-default.json
@@ -10,9 +10,7 @@
         "site.global.app_user": "hadoop",
         "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${pkg.version}",
         "site.global.hbase_instance_name": "instancename",
-        "site.global.hbase_root_password": "secret",
         "site.global.user_group": "hadoop",
-        "site.global.monitor_protocol": "http",
         "site.global.hbase_additional_cp": "c:\\java\\lib\\tools.jar;",
         "site.global.java_library_path": "c:\\hdp\\hadoop\\bin",
         "site.global.hbase_rest_port": "17000",
diff --git a/app-packages/storm/jmx_metrics.json b/app-packages/storm/jmx_metrics.json
index f7d4e60..b0816b1 100644
--- a/app-packages/storm/jmx_metrics.json
+++ b/app-packages/storm/jmx_metrics.json
@@ -2,17 +2,17 @@
     "Component": {
         "NIMBUS": {
             "FreeSlots": {
-                "metric": "$['slots.free']",
+                "metric": "$['slotsFree']",
                 "pointInTime": true,
                 "temporal": false
             },
             "Tasks": {
-                "metric": "$['tasks.total']",
+                "metric": "$['tasksTotal']",
                 "pointInTime": true,
                 "temporal": false
             },
             "Executors": {
-                "metric": "$['executors.total']",
+                "metric": "$['executorsTotal']",
                 "pointInTime": true,
                 "temporal": false
             },
@@ -22,7 +22,7 @@
                 "temporal": false
             },
             "NimbusUptime": {
-                "metric": "$['nimbus.uptime']",
+                "metric": "$['nimbusUptime']",
                 "pointInTime": true,
                 "temporal": false
             }
diff --git a/app-packages/storm/resources-default.json b/app-packages/storm/resources-default.json
index a36f005..65e6579 100644
--- a/app-packages/storm/resources-default.json
+++ b/app-packages/storm/resources-default.json
@@ -8,22 +8,27 @@
   },
   "components": {
     "slider-appmaster": {
+      "yarn.memory": "512"
     },
     "NIMBUS": {
       "yarn.role.priority": "1",
-      "yarn.component.instances": "1"
+      "yarn.component.instances": "1",
+      "yarn.memory": "2048"
     },
     "STORM_UI_SERVER": {
       "yarn.role.priority": "2",
-      "yarn.component.instances": "1"
+      "yarn.component.instances": "1",
+      "yarn.memory": "1278"
     },
     "DRPC_SERVER": {
       "yarn.role.priority": "3",
-      "yarn.component.instances": "1"
+      "yarn.component.instances": "1",
+      "yarn.memory": "1278"
     },
     "SUPERVISOR": {
       "yarn.role.priority": "4",
-      "yarn.component.instances": "1"
+      "yarn.component.instances": "1",
+      "yarn.memory": "3072"
     }
   }
 }