kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jun...@apache.org
Subject [4/5] git commit: System Test - Update all testcase_xxxx_properties.json for properties keys uniform naming convention; kafka-688; patched by Jun Rao; reviewed by Jun Rao
Date Mon, 14 Jan 2013 22:31:43 GMT
System Test - Update all testcase_xxxx_properties.json for properties keys uniform naming convention; kafka-688; patched by Jun Rao; reviewed by Jun Rao


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/bd5504c0
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/bd5504c0
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/bd5504c0

Branch: refs/heads/trunk
Commit: bd5504c0520d393715afe524313c5c8ac00337a2
Parents: 53818bb
Author: Jun Rao <junrao@gmail.com>
Authored: Mon Jan 14 14:29:34 2013 -0800
Committer: Jun Rao <junrao@gmail.com>
Committed: Mon Jan 14 14:29:34 2013 -0800

----------------------------------------------------------------------
 .../testcase_9001/testcase_9001_properties.json    |   17 +++++----
 .../testcase_9003/testcase_9003_properties.json    |   17 +++++----
 .../testcase_9004/testcase_9004_properties.json    |   17 +++++----
 .../testcase_9005/testcase_9005_properties.json    |   19 ++++++----
 .../testcase_9006/testcase_9006_properties.json    |   19 ++++++----
 .../testcase_5001/testcase_5001_properties.json    |   26 +++++++-------
 .../testcase_5002/testcase_5002_properties.json    |   26 +++++++-------
 .../testcase_5003/testcase_5003_properties.json    |   26 +++++++-------
 .../testcase_5004/testcase_5004_properties.json    |   26 +++++++-------
 .../testcase_5005/testcase_5005_properties.json    |   28 +++++++-------
 .../testcase_5006/testcase_5006_properties.json    |   28 +++++++-------
 .../testcase_0001/testcase_0001_properties.json    |   14 ++++----
 .../testcase_0002/testcase_0002_properties.json    |   14 ++++----
 .../testcase_0003/testcase_0003_properties.json    |   14 ++++----
 .../testcase_0004/testcase_0004_properties.json    |   14 ++++----
 .../testcase_0005/testcase_0005_properties.json    |   14 ++++----
 .../testcase_0006/testcase_0006_properties.json    |   14 ++++----
 .../testcase_0007/testcase_0007_properties.json    |   14 ++++----
 .../testcase_0008/testcase_0008_properties.json    |   14 ++++----
 .../testcase_0009/testcase_0009_properties.json    |   14 ++++----
 .../testcase_0010/testcase_0010_properties.json    |   14 ++++----
 .../testcase_0021/testcase_0021_properties.json    |   16 ++++----
 .../testcase_0022/testcase_0022_properties.json    |   16 ++++----
 .../testcase_0023/testcase_0023_properties.json    |   16 ++++----
 .../testcase_0101/testcase_0101_properties.json    |   14 ++++----
 .../testcase_0102/testcase_0102_properties.json    |   14 ++++----
 .../testcase_0103/testcase_0103_properties.json    |   14 ++++----
 .../testcase_0104/testcase_0104_properties.json    |   14 ++++----
 .../testcase_0105/testcase_0105_properties.json    |   14 ++++----
 .../testcase_0106/testcase_0106_properties.json    |   14 ++++----
 .../testcase_0107/testcase_0107_properties.json    |   14 ++++----
 .../testcase_0108/testcase_0108_properties.json    |   14 ++++----
 .../testcase_0109/testcase_0109_properties.json    |   14 ++++----
 .../testcase_0110/testcase_0110_properties.json    |   14 ++++----
 .../testcase_0111/testcase_0111_properties.json    |   14 ++++----
 .../testcase_0112/testcase_0112_properties.json    |   14 ++++----
 .../testcase_0113/testcase_0113_properties.json    |   14 ++++----
 .../testcase_0114/testcase_0114_properties.json    |   14 ++++----
 .../testcase_0115/testcase_0115_properties.json    |   14 ++++----
 .../testcase_0116/testcase_0116_properties.json    |   14 ++++----
 .../testcase_0117/testcase_0117_properties.json    |   14 ++++----
 .../testcase_0118/testcase_0118_properties.json    |   14 ++++----
 .../testcase_0121/testcase_0121_properties.json    |   16 ++++----
 .../testcase_0122/testcase_0122_properties.json    |   16 ++++----
 .../testcase_0123/testcase_0123_properties.json    |   16 ++++----
 .../testcase_0124/testcase_0124_properties.json    |   16 ++++----
 .../testcase_0125/testcase_0125_properties.json    |   16 ++++----
 .../testcase_0126/testcase_0126_properties.json    |   16 ++++----
 .../testcase_0127/testcase_0127_properties.json    |   16 ++++----
 .../testcase_0131/testcase_0131_properties.json    |   16 ++++----
 .../testcase_0132/testcase_0132_properties.json    |   16 ++++----
 .../testcase_0133/testcase_0133_properties.json    |   16 ++++----
 .../testcase_0151/testcase_0151_properties.json    |   14 ++++----
 .../testcase_0152/testcase_0152_properties.json    |   14 ++++----
 .../testcase_0153/testcase_0153_properties.json    |   14 ++++----
 .../testcase_0154/testcase_0154_properties.json    |   14 ++++----
 .../testcase_0155/testcase_0155_properties.json    |   14 ++++----
 .../testcase_0156/testcase_0156_properties.json    |   14 ++++----
 .../testcase_0157/testcase_0157_properties.json    |   14 ++++----
 .../testcase_0158/testcase_0158_properties.json    |   14 ++++----
 .../testcase_0201/testcase_0201_properties.json    |   14 ++++----
 .../testcase_0202/testcase_0202_properties.json    |   14 ++++----
 .../testcase_0203/testcase_0203_properties.json    |   14 ++++----
 .../testcase_0204/testcase_0204_properties.json    |   14 ++++----
 .../testcase_0205/testcase_0205_properties.json    |   14 ++++----
 .../testcase_0206/testcase_0206_properties.json    |   14 ++++----
 .../testcase_0207/testcase_0207_properties.json    |   14 ++++----
 .../testcase_0208/testcase_0208_properties.json    |   14 ++++----
 .../testcase_0251/testcase_0251_properties.json    |   14 ++++----
 .../testcase_0252/testcase_0252_properties.json    |   14 ++++----
 .../testcase_0253/testcase_0253_properties.json    |   14 ++++----
 .../testcase_0254/testcase_0254_properties.json    |   14 ++++----
 .../testcase_0255/testcase_0255_properties.json    |   14 ++++----
 .../testcase_0256/testcase_0256_properties.json    |   14 ++++----
 .../testcase_0257/testcase_0257_properties.json    |   14 ++++----
 .../testcase_0258/testcase_0258_properties.json    |   14 ++++----
 .../testcase_0301/testcase_0301_properties.json    |   14 ++++----
 .../testcase_0302/testcase_0302_properties.json    |   14 ++++----
 .../testcase_0303/testcase_0303_properties.json    |   14 ++++----
 .../testcase_0304/testcase_0304_properties.json    |   14 ++++----
 .../testcase_0305/testcase_0305_properties.json    |   14 ++++----
 .../testcase_0306/testcase_0306_properties.json    |   14 ++++----
 .../testcase_0307/testcase_0307_properties.json    |   14 ++++----
 .../testcase_0308/testcase_0308_properties.json    |   14 ++++----
 .../testcase_1/testcase_1_properties.json          |   14 ++++----
 .../testcase_4001/testcase_4001_properties.json    |   16 ++++----
 .../testcase_4002/testcase_4002_properties.json    |   16 ++++----
 .../testcase_4003/testcase_4003_properties.json    |   16 ++++----
 .../testcase_4004/testcase_4004_properties.json    |   16 ++++----
 .../testcase_4005/testcase_4005_properties.json    |   16 ++++----
 .../testcase_4006/testcase_4006_properties.json    |   16 ++++----
 .../testcase_4007/testcase_4007_properties.json    |   16 ++++----
 .../testcase_4008/testcase_4008_properties.json    |   16 ++++----
 .../testcase_4011/testcase_4011_properties.json    |   16 ++++----
 .../testcase_4012/testcase_4012_properties.json    |   16 ++++----
 .../testcase_4013/testcase_4013_properties.json    |   16 ++++----
 .../testcase_4014/testcase_4014_properties.json    |   16 ++++----
 .../testcase_4015/testcase_4015_properties.json    |   16 ++++----
 .../testcase_4016/testcase_4016_properties.json    |   16 ++++----
 .../testcase_4017/testcase_4017_properties.json    |   16 ++++----
 .../testcase_4018/testcase_4018_properties.json    |   16 ++++----
 .../testcase_9051/testcase_9051_properties.json    |   14 ++++----
 system_test/utils/kafka_system_test_utils.py       |   12 ++++++-
 103 files changed, 809 insertions(+), 784 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/migration_tool_testsuite/testcase_9001/testcase_9001_properties.json
----------------------------------------------------------------------
diff --git a/system_test/migration_tool_testsuite/testcase_9001/testcase_9001_properties.json b/system_test/migration_tool_testsuite/testcase_9001/testcase_9001_properties.json
index c4bb968..47272a3 100644
--- a/system_test/migration_tool_testsuite/testcase_9001/testcase_9001_properties.json
+++ b/system_test/migration_tool_testsuite/testcase_9001/testcase_9001_properties.json
@@ -29,6 +29,7 @@
       "entity_id": "1",
       "port": "9091",
       "brokerid": "1",
+      "07_client": "true",
       "log.file.size": "51200",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_1.log",
@@ -38,6 +39,7 @@
       "entity_id": "2",
       "port": "9092",
       "brokerid": "2",
+      "07_client": "true",
       "log.file.size": "51200",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_2.log",
@@ -47,6 +49,7 @@
       "entity_id": "3",
       "port": "9093",
       "brokerid": "3",
+      "07_client": "true",
       "log.file.size": "51200",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_3.log",
@@ -55,8 +58,8 @@
     {
       "entity_id": "4",
       "port": "9094",
-      "brokerid": "4",
-      "log.file.size": "51200",
+      "broker.id": "4",
+      "log.segment.size": "51200",
       "log.dir": "/tmp/kafka_server_4_logs",
       "log_filename": "kafka_server_4.log",
       "config_filename": "kafka_server_4.properties"
@@ -64,8 +67,8 @@
     {
       "entity_id": "5",
       "port": "9095",
-      "brokerid": "5",
-      "log.file.size": "51200",
+      "broker.id": "5",
+      "log.segment.size": "51200",
       "log.dir": "/tmp/kafka_server_5_logs",
       "log_filename": "kafka_server_5.log",
       "config_filename": "kafka_server_5.properties"
@@ -73,8 +76,8 @@
     {
       "entity_id": "6",
       "port": "9096",
-      "brokerid": "6",
-      "log.file.size": "51200",
+      "broker.id": "6",
+      "log.segment.size": "51200",
       "log.dir": "/tmp/kafka_server_6_logs",
       "log_filename": "kafka_server_6.log",
       "config_filename": "kafka_server_6.properties"
@@ -94,7 +97,7 @@
     {
       "entity_id": "8",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_8.log",
       "formatter": "kafka.consumer.ChecksumMessageFormatter",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/migration_tool_testsuite/testcase_9003/testcase_9003_properties.json
----------------------------------------------------------------------
diff --git a/system_test/migration_tool_testsuite/testcase_9003/testcase_9003_properties.json b/system_test/migration_tool_testsuite/testcase_9003/testcase_9003_properties.json
index 15bf89e..0288eea 100644
--- a/system_test/migration_tool_testsuite/testcase_9003/testcase_9003_properties.json
+++ b/system_test/migration_tool_testsuite/testcase_9003/testcase_9003_properties.json
@@ -30,6 +30,7 @@
       "entity_id": "1",
       "port": "9091",
       "brokerid": "1",
+      "07_client": "true",
       "log.file.size": "51200",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_1.log",
@@ -39,6 +40,7 @@
       "entity_id": "2",
       "port": "9092",
       "brokerid": "2",
+      "07_client": "true",
       "log.file.size": "51200",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_2.log",
@@ -48,6 +50,7 @@
       "entity_id": "3",
       "port": "9093",
       "brokerid": "3",
+      "07_client": "true",
       "log.file.size": "51200",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_3.log",
@@ -56,8 +59,8 @@
     {
       "entity_id": "4",
       "port": "9094",
-      "brokerid": "4",
-      "log.file.size": "51200",
+      "broker.id": "4",
+      "log.segment.size": "51200",
       "log.dir": "/tmp/kafka_server_4_logs",
       "log_filename": "kafka_server_4.log",
       "config_filename": "kafka_server_4.properties"
@@ -65,8 +68,8 @@
     {
       "entity_id": "5",
       "port": "9095",
-      "brokerid": "5",
-      "log.file.size": "51200",
+      "broker.id": "5",
+      "log.segment.size": "51200",
       "log.dir": "/tmp/kafka_server_5_logs",
       "log_filename": "kafka_server_5.log",
       "config_filename": "kafka_server_5.properties"
@@ -74,8 +77,8 @@
     {
       "entity_id": "6",
       "port": "9096",
-      "brokerid": "6",
-      "log.file.size": "51200",
+      "broker.id": "6",
+      "log.segment.size": "51200",
       "log.dir": "/tmp/kafka_server_6_logs",
       "log_filename": "kafka_server_6.log",
       "config_filename": "kafka_server_6.properties"
@@ -95,7 +98,7 @@
     {
       "entity_id": "8",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_8.log",
       "formatter": "kafka.consumer.ChecksumMessageFormatter",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/migration_tool_testsuite/testcase_9004/testcase_9004_properties.json
----------------------------------------------------------------------
diff --git a/system_test/migration_tool_testsuite/testcase_9004/testcase_9004_properties.json b/system_test/migration_tool_testsuite/testcase_9004/testcase_9004_properties.json
index 77dc5d3..1137696 100644
--- a/system_test/migration_tool_testsuite/testcase_9004/testcase_9004_properties.json
+++ b/system_test/migration_tool_testsuite/testcase_9004/testcase_9004_properties.json
@@ -30,6 +30,7 @@
       "entity_id": "1",
       "port": "9091",
       "brokerid": "1",
+      "07_client": "true",
       "log.file.size": "51200",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_1.log",
@@ -39,6 +40,7 @@
       "entity_id": "2",
       "port": "9092",
       "brokerid": "2",
+      "07_client": "true",
       "log.file.size": "51200",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_2.log",
@@ -48,6 +50,7 @@
       "entity_id": "3",
       "port": "9093",
       "brokerid": "3",
+      "07_client": "true",
       "log.file.size": "51200",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_3.log",
@@ -56,8 +59,8 @@
     {
       "entity_id": "4",
       "port": "9094",
-      "brokerid": "4",
-      "log.file.size": "51200",
+      "broker.id": "4",
+      "log.segment.size": "51200",
       "log.dir": "/tmp/kafka_server_4_logs",
       "log_filename": "kafka_server_4.log",
       "config_filename": "kafka_server_4.properties"
@@ -65,8 +68,8 @@
     {
       "entity_id": "5",
       "port": "9095",
-      "brokerid": "5",
-      "log.file.size": "51200",
+      "broker.id": "5",
+      "log.segment.size": "51200",
       "log.dir": "/tmp/kafka_server_5_logs",
       "log_filename": "kafka_server_5.log",
       "config_filename": "kafka_server_5.properties"
@@ -74,8 +77,8 @@
     {
       "entity_id": "6",
       "port": "9096",
-      "brokerid": "6",
-      "log.file.size": "51200",
+      "broker.id": "6",
+      "log.segment.size": "51200",
       "log.dir": "/tmp/kafka_server_6_logs",
       "log_filename": "kafka_server_6.log",
       "config_filename": "kafka_server_6.properties"
@@ -95,7 +98,7 @@
     {
       "entity_id": "8",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_8.log",
       "formatter": "kafka.consumer.ChecksumMessageFormatter",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/migration_tool_testsuite/testcase_9005/testcase_9005_properties.json
----------------------------------------------------------------------
diff --git a/system_test/migration_tool_testsuite/testcase_9005/testcase_9005_properties.json b/system_test/migration_tool_testsuite/testcase_9005/testcase_9005_properties.json
index b14a776..8867aa5 100644
--- a/system_test/migration_tool_testsuite/testcase_9005/testcase_9005_properties.json
+++ b/system_test/migration_tool_testsuite/testcase_9005/testcase_9005_properties.json
@@ -39,6 +39,7 @@
       "entity_id": "2",
       "port": "9091",
       "brokerid": "1",
+      "07_client": "true",
       "log.file.size": "51200",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_2.log",
@@ -48,6 +49,7 @@
       "entity_id": "3",
       "port": "9092",
       "brokerid": "2",
+      "07_client": "true",
       "log.file.size": "51200",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_3.log",
@@ -57,6 +59,7 @@
       "entity_id": "4",
       "port": "9093",
       "brokerid": "3",
+      "07_client": "true",
       "log.file.size": "51200",
       "log.dir": "/tmp/kafka_server_4_logs",
       "log_filename": "kafka_server_4.log",
@@ -67,8 +70,8 @@
     {
       "entity_id": "5",
       "port": "9094",
-      "brokerid": "4",
-      "log.file.size": "51200",
+      "broker.id": "4",
+      "log.segment.size": "51200",
       "log.dir": "/tmp/kafka_server_5_logs",
       "log_filename": "kafka_server_5.log",
       "config_filename": "kafka_server_5.properties"
@@ -76,8 +79,8 @@
     {
       "entity_id": "6",
       "port": "9095",
-      "brokerid": "5",
-      "log.file.size": "51200",
+      "broker.id": "5",
+      "log.segment.size": "51200",
       "log.dir": "/tmp/kafka_server_6_logs",
       "log_filename": "kafka_server_6.log",
       "config_filename": "kafka_server_6.properties"
@@ -85,8 +88,8 @@
     {
       "entity_id": "7",
       "port": "9096",
-      "brokerid": "6",
-      "log.file.size": "51200",
+      "broker.id": "6",
+      "log.segment.size": "51200",
       "log.dir": "/tmp/kafka_server_7_logs",
       "log_filename": "kafka_server_7.log",
       "config_filename": "kafka_server_7.properties"
@@ -122,7 +125,7 @@
     {
       "entity_id": "10",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_10.log",
       "formatter": "kafka.consumer.ChecksumMessageFormatter",
@@ -131,7 +134,7 @@
     {
       "entity_id": "11",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_11.log",
       "formatter": "kafka.consumer.ChecksumMessageFormatter",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/migration_tool_testsuite/testcase_9006/testcase_9006_properties.json
----------------------------------------------------------------------
diff --git a/system_test/migration_tool_testsuite/testcase_9006/testcase_9006_properties.json b/system_test/migration_tool_testsuite/testcase_9006/testcase_9006_properties.json
index 9f58f10..0ad5e7f 100644
--- a/system_test/migration_tool_testsuite/testcase_9006/testcase_9006_properties.json
+++ b/system_test/migration_tool_testsuite/testcase_9006/testcase_9006_properties.json
@@ -39,6 +39,7 @@
       "entity_id": "2",
       "port": "9091",
       "brokerid": "1",
+      "07_client": "true",
       "log.file.size": "51200",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_2.log",
@@ -48,6 +49,7 @@
       "entity_id": "3",
       "port": "9092",
       "brokerid": "2",
+      "07_client": "true",
       "log.file.size": "51200",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_3.log",
@@ -57,6 +59,7 @@
       "entity_id": "4",
       "port": "9093",
       "brokerid": "3",
+      "07_client": "true",
       "log.file.size": "51200",
       "log.dir": "/tmp/kafka_server_4_logs",
       "log_filename": "kafka_server_4.log",
@@ -67,8 +70,8 @@
     {
       "entity_id": "5",
       "port": "9094",
-      "brokerid": "4",
-      "log.file.size": "51200",
+      "broker.id": "4",
+      "log.segment.size": "51200",
       "log.dir": "/tmp/kafka_server_5_logs",
       "log_filename": "kafka_server_5.log",
       "config_filename": "kafka_server_5.properties"
@@ -76,8 +79,8 @@
     {
       "entity_id": "6",
       "port": "9095",
-      "brokerid": "5",
-      "log.file.size": "51200",
+      "broker.id": "5",
+      "log.segment.size": "51200",
       "log.dir": "/tmp/kafka_server_6_logs",
       "log_filename": "kafka_server_6.log",
       "config_filename": "kafka_server_6.properties"
@@ -85,8 +88,8 @@
     {
       "entity_id": "7",
       "port": "9096",
-      "brokerid": "6",
-      "log.file.size": "51200",
+      "broker.id": "6",
+      "log.segment.size": "51200",
       "log.dir": "/tmp/kafka_server_7_logs",
       "log_filename": "kafka_server_7.log",
       "config_filename": "kafka_server_7.properties"
@@ -122,7 +125,7 @@
     {
       "entity_id": "10",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_10.log",
       "formatter": "kafka.consumer.ChecksumMessageFormatter",
@@ -131,7 +134,7 @@
     {
       "entity_id": "11",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_11.log",
       "formatter": "kafka.consumer.ChecksumMessageFormatter",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/mirror_maker_testsuite/testcase_5001/testcase_5001_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_5001/testcase_5001_properties.json b/system_test/mirror_maker_testsuite/testcase_5001/testcase_5001_properties.json
index 8336650..f520d6a 100644
--- a/system_test/mirror_maker_testsuite/testcase_5001/testcase_5001_properties.json
+++ b/system_test/mirror_maker_testsuite/testcase_5001/testcase_5001_properties.json
@@ -53,8 +53,8 @@
     {
       "entity_id": "4",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_4_logs",
       "log_filename": "kafka_server_4.log",
       "config_filename": "kafka_server_4.properties"
@@ -62,8 +62,8 @@
     {
       "entity_id": "5",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_5_logs",
       "log_filename": "kafka_server_5.log",
       "config_filename": "kafka_server_5.properties"
@@ -71,8 +71,8 @@
     {
       "entity_id": "6",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_6_logs",
       "log_filename": "kafka_server_6.log",
       "config_filename": "kafka_server_6.properties"
@@ -80,8 +80,8 @@
     {
       "entity_id": "7",
       "port": "9094",
-      "brokerid": "4",
-      "log.file.size": "10240",
+      "broker.id": "4",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_7_logs",
       "log_filename": "kafka_server_7.log",
       "config_filename": "kafka_server_7.properties"
@@ -89,8 +89,8 @@
     {
       "entity_id": "8",
       "port": "9095",
-      "brokerid": "5",
-      "log.file.size": "10240",
+      "broker.id": "5",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_8_logs",
       "log_filename": "kafka_server_8.log",
       "config_filename": "kafka_server_8.properties"
@@ -98,8 +98,8 @@
     {
       "entity_id": "9",
       "port": "9096",
-      "brokerid": "6",
-      "log.file.size": "10240",
+      "broker.id": "6",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_9_logs",
       "log_filename": "kafka_server_9.log",
       "config_filename": "kafka_server_9.properties"
@@ -120,7 +120,7 @@
     {
       "entity_id": "11",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_11.log",
       "config_filename": "console_consumer_11.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/mirror_maker_testsuite/testcase_5002/testcase_5002_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_5002/testcase_5002_properties.json b/system_test/mirror_maker_testsuite/testcase_5002/testcase_5002_properties.json
index a59d034..86fd73d 100644
--- a/system_test/mirror_maker_testsuite/testcase_5002/testcase_5002_properties.json
+++ b/system_test/mirror_maker_testsuite/testcase_5002/testcase_5002_properties.json
@@ -53,8 +53,8 @@
     {
       "entity_id": "4",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_4_logs",
       "log_filename": "kafka_server_4.log",
       "config_filename": "kafka_server_4.properties"
@@ -62,8 +62,8 @@
     {
       "entity_id": "5",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_5_logs",
       "log_filename": "kafka_server_5.log",
       "config_filename": "kafka_server_5.properties"
@@ -71,8 +71,8 @@
     {
       "entity_id": "6",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_6_logs",
       "log_filename": "kafka_server_6.log",
       "config_filename": "kafka_server_6.properties"
@@ -80,8 +80,8 @@
     {
       "entity_id": "7",
       "port": "9094",
-      "brokerid": "4",
-      "log.file.size": "10240",
+      "broker.id": "4",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_7_logs",
       "log_filename": "kafka_server_7.log",
       "config_filename": "kafka_server_7.properties"
@@ -89,8 +89,8 @@
     {
       "entity_id": "8",
       "port": "9095",
-      "brokerid": "5",
-      "log.file.size": "10240",
+      "broker.id": "5",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_8_logs",
       "log_filename": "kafka_server_8.log",
       "config_filename": "kafka_server_8.properties"
@@ -98,8 +98,8 @@
     {
       "entity_id": "9",
       "port": "9096",
-      "brokerid": "6",
-      "log.file.size": "10240",
+      "broker.id": "6",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_9_logs",
       "log_filename": "kafka_server_9.log",
       "config_filename": "kafka_server_9.properties"
@@ -120,7 +120,7 @@
     {
       "entity_id": "11",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_11.log",
       "config_filename": "console_consumer_11.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/mirror_maker_testsuite/testcase_5003/testcase_5003_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_5003/testcase_5003_properties.json b/system_test/mirror_maker_testsuite/testcase_5003/testcase_5003_properties.json
index aa4feb2..3807d84 100644
--- a/system_test/mirror_maker_testsuite/testcase_5003/testcase_5003_properties.json
+++ b/system_test/mirror_maker_testsuite/testcase_5003/testcase_5003_properties.json
@@ -54,8 +54,8 @@
     {
       "entity_id": "4",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_4_logs",
       "log_filename": "kafka_server_4.log",
       "config_filename": "kafka_server_4.properties"
@@ -63,8 +63,8 @@
     {
       "entity_id": "5",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_5_logs",
       "log_filename": "kafka_server_5.log",
       "config_filename": "kafka_server_5.properties"
@@ -72,8 +72,8 @@
     {
       "entity_id": "6",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_6_logs",
       "log_filename": "kafka_server_6.log",
       "config_filename": "kafka_server_6.properties"
@@ -81,8 +81,8 @@
     {
       "entity_id": "7",
       "port": "9094",
-      "brokerid": "4",
-      "log.file.size": "10240",
+      "broker.id": "4",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_7_logs",
       "log_filename": "kafka_server_7.log",
       "config_filename": "kafka_server_7.properties"
@@ -90,8 +90,8 @@
     {
       "entity_id": "8",
       "port": "9095",
-      "brokerid": "5",
-      "log.file.size": "10240",
+      "broker.id": "5",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_8_logs",
       "log_filename": "kafka_server_8.log",
       "config_filename": "kafka_server_8.properties"
@@ -99,8 +99,8 @@
     {
       "entity_id": "9",
       "port": "9096",
-      "brokerid": "6",
-      "log.file.size": "10240",
+      "broker.id": "6",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_9_logs",
       "log_filename": "kafka_server_9.log",
       "config_filename": "kafka_server_9.properties"
@@ -121,7 +121,7 @@
     {
       "entity_id": "11",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_11.log",
       "config_filename": "console_consumer_11.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/mirror_maker_testsuite/testcase_5004/testcase_5004_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_5004/testcase_5004_properties.json b/system_test/mirror_maker_testsuite/testcase_5004/testcase_5004_properties.json
index 948c315..a887af2 100644
--- a/system_test/mirror_maker_testsuite/testcase_5004/testcase_5004_properties.json
+++ b/system_test/mirror_maker_testsuite/testcase_5004/testcase_5004_properties.json
@@ -54,8 +54,8 @@
     {
       "entity_id": "4",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_4_logs",
       "log_filename": "kafka_server_4.log",
       "config_filename": "kafka_server_4.properties"
@@ -63,8 +63,8 @@
     {
       "entity_id": "5",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_5_logs",
       "log_filename": "kafka_server_5.log",
       "config_filename": "kafka_server_5.properties"
@@ -72,8 +72,8 @@
     {
       "entity_id": "6",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_6_logs",
       "log_filename": "kafka_server_6.log",
       "config_filename": "kafka_server_6.properties"
@@ -81,8 +81,8 @@
     {
       "entity_id": "7",
       "port": "9094",
-      "brokerid": "4",
-      "log.file.size": "10240",
+      "broker.id": "4",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_7_logs",
       "log_filename": "kafka_server_7.log",
       "config_filename": "kafka_server_7.properties"
@@ -90,8 +90,8 @@
     {
       "entity_id": "8",
       "port": "9095",
-      "brokerid": "5",
-      "log.file.size": "10240",
+      "broker.id": "5",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_8_logs",
       "log_filename": "kafka_server_8.log",
       "config_filename": "kafka_server_8.properties"
@@ -99,8 +99,8 @@
     {
       "entity_id": "9",
       "port": "9096",
-      "brokerid": "6",
-      "log.file.size": "10240",
+      "broker.id": "6",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_9_logs",
       "log_filename": "kafka_server_9.log",
       "config_filename": "kafka_server_9.properties"
@@ -121,7 +121,7 @@
     {
       "entity_id": "11",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_11.log",
       "config_filename": "console_consumer_11.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/mirror_maker_testsuite/testcase_5005/testcase_5005_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_5005/testcase_5005_properties.json b/system_test/mirror_maker_testsuite/testcase_5005/testcase_5005_properties.json
index ce2ee50..6dab54e 100644
--- a/system_test/mirror_maker_testsuite/testcase_5005/testcase_5005_properties.json
+++ b/system_test/mirror_maker_testsuite/testcase_5005/testcase_5005_properties.json
@@ -54,8 +54,8 @@
     {
       "entity_id": "4",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_4_logs",
       "log_filename": "kafka_server_4.log",
       "config_filename": "kafka_server_4.properties"
@@ -63,8 +63,8 @@
     {
       "entity_id": "5",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_5_logs",
       "log_filename": "kafka_server_5.log",
       "config_filename": "kafka_server_5.properties"
@@ -72,8 +72,8 @@
     {
       "entity_id": "6",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_6_logs",
       "log_filename": "kafka_server_6.log",
       "config_filename": "kafka_server_6.properties"
@@ -81,8 +81,8 @@
     {
       "entity_id": "7",
       "port": "9094",
-      "brokerid": "4",
-      "log.file.size": "10240",
+      "broker.id": "4",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_7_logs",
       "log_filename": "kafka_server_7.log",
       "config_filename": "kafka_server_7.properties"
@@ -90,8 +90,8 @@
     {
       "entity_id": "8",
       "port": "9095",
-      "brokerid": "5",
-      "log.file.size": "10240",
+      "broker.id": "5",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_8_logs",
       "log_filename": "kafka_server_8.log",
       "config_filename": "kafka_server_8.properties"
@@ -99,8 +99,8 @@
     {
       "entity_id": "9",
       "port": "9096",
-      "brokerid": "6",
-      "log.file.size": "10240",
+      "broker.id": "6",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_9_logs",
       "log_filename": "kafka_server_9.log",
       "config_filename": "kafka_server_9.properties"
@@ -134,7 +134,7 @@
     {
       "entity_id": "12",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_12.log",
       "config_filename": "console_consumer_12.properties"
@@ -142,7 +142,7 @@
     {
       "entity_id": "13",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_13.log",
       "config_filename": "console_consumer_13.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/mirror_maker_testsuite/testcase_5006/testcase_5006_properties.json
----------------------------------------------------------------------
diff --git a/system_test/mirror_maker_testsuite/testcase_5006/testcase_5006_properties.json b/system_test/mirror_maker_testsuite/testcase_5006/testcase_5006_properties.json
index e98a538..8181a21 100644
--- a/system_test/mirror_maker_testsuite/testcase_5006/testcase_5006_properties.json
+++ b/system_test/mirror_maker_testsuite/testcase_5006/testcase_5006_properties.json
@@ -54,8 +54,8 @@
     {
       "entity_id": "4",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_4_logs",
       "log_filename": "kafka_server_4.log",
       "config_filename": "kafka_server_4.properties"
@@ -63,8 +63,8 @@
     {
       "entity_id": "5",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_5_logs",
       "log_filename": "kafka_server_5.log",
       "config_filename": "kafka_server_5.properties"
@@ -72,8 +72,8 @@
     {
       "entity_id": "6",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_6_logs",
       "log_filename": "kafka_server_6.log",
       "config_filename": "kafka_server_6.properties"
@@ -81,8 +81,8 @@
     {
       "entity_id": "7",
       "port": "9094",
-      "brokerid": "4",
-      "log.file.size": "10240",
+      "broker.id": "4",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_7_logs",
       "log_filename": "kafka_server_7.log",
       "config_filename": "kafka_server_7.properties"
@@ -90,8 +90,8 @@
     {
       "entity_id": "8",
       "port": "9095",
-      "brokerid": "5",
-      "log.file.size": "10240",
+      "broker.id": "5",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_8_logs",
       "log_filename": "kafka_server_8.log",
       "config_filename": "kafka_server_8.properties"
@@ -99,8 +99,8 @@
     {
       "entity_id": "9",
       "port": "9096",
-      "brokerid": "6",
-      "log.file.size": "10240",
+      "broker.id": "6",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_9_logs",
       "log_filename": "kafka_server_9.log",
       "config_filename": "kafka_server_9.properties"
@@ -134,7 +134,7 @@
     {
       "entity_id": "12",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_12.log",
       "config_filename": "console_consumer_12.properties"
@@ -142,7 +142,7 @@
     {
       "entity_id": "13",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_13.log",
       "config_filename": "console_consumer_13.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0001/testcase_0001_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0001/testcase_0001_properties.json b/system_test/replication_testsuite/testcase_0001/testcase_0001_properties.json
index cefc9bf..10dc33b 100644
--- a/system_test/replication_testsuite/testcase_0001/testcase_0001_properties.json
+++ b/system_test/replication_testsuite/testcase_0001/testcase_0001_properties.json
@@ -28,8 +28,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -37,8 +37,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -46,8 +46,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -67,7 +67,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0002/testcase_0002_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0002/testcase_0002_properties.json b/system_test/replication_testsuite/testcase_0002/testcase_0002_properties.json
index 68d3d53..f83ed71 100644
--- a/system_test/replication_testsuite/testcase_0002/testcase_0002_properties.json
+++ b/system_test/replication_testsuite/testcase_0002/testcase_0002_properties.json
@@ -28,8 +28,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -37,8 +37,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -46,8 +46,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -67,7 +67,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0003/testcase_0003_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0003/testcase_0003_properties.json b/system_test/replication_testsuite/testcase_0003/testcase_0003_properties.json
index ea54e20..8ab7d9d 100644
--- a/system_test/replication_testsuite/testcase_0003/testcase_0003_properties.json
+++ b/system_test/replication_testsuite/testcase_0003/testcase_0003_properties.json
@@ -28,8 +28,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -37,8 +37,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -46,8 +46,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -67,7 +67,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0004/testcase_0004_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0004/testcase_0004_properties.json b/system_test/replication_testsuite/testcase_0004/testcase_0004_properties.json
index 2da1558..f5b2b0c 100644
--- a/system_test/replication_testsuite/testcase_0004/testcase_0004_properties.json
+++ b/system_test/replication_testsuite/testcase_0004/testcase_0004_properties.json
@@ -28,8 +28,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -37,8 +37,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -46,8 +46,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -67,7 +67,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0005/testcase_0005_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0005/testcase_0005_properties.json b/system_test/replication_testsuite/testcase_0005/testcase_0005_properties.json
index af819d7..1c884a7 100644
--- a/system_test/replication_testsuite/testcase_0005/testcase_0005_properties.json
+++ b/system_test/replication_testsuite/testcase_0005/testcase_0005_properties.json
@@ -28,8 +28,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -37,8 +37,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -46,8 +46,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -67,7 +67,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0006/testcase_0006_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0006/testcase_0006_properties.json b/system_test/replication_testsuite/testcase_0006/testcase_0006_properties.json
index f46d32c..49aece9 100644
--- a/system_test/replication_testsuite/testcase_0006/testcase_0006_properties.json
+++ b/system_test/replication_testsuite/testcase_0006/testcase_0006_properties.json
@@ -28,8 +28,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -37,8 +37,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -46,8 +46,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -67,7 +67,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0007/testcase_0007_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0007/testcase_0007_properties.json b/system_test/replication_testsuite/testcase_0007/testcase_0007_properties.json
index fa4994d..e21b9bd 100644
--- a/system_test/replication_testsuite/testcase_0007/testcase_0007_properties.json
+++ b/system_test/replication_testsuite/testcase_0007/testcase_0007_properties.json
@@ -28,8 +28,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -37,8 +37,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -46,8 +46,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -67,7 +67,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0008/testcase_0008_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0008/testcase_0008_properties.json b/system_test/replication_testsuite/testcase_0008/testcase_0008_properties.json
index 66afe7c..8c3b8c9 100644
--- a/system_test/replication_testsuite/testcase_0008/testcase_0008_properties.json
+++ b/system_test/replication_testsuite/testcase_0008/testcase_0008_properties.json
@@ -28,8 +28,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -37,8 +37,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -46,8 +46,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -67,7 +67,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0009/testcase_0009_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0009/testcase_0009_properties.json b/system_test/replication_testsuite/testcase_0009/testcase_0009_properties.json
index 2278e70..656f935 100644
--- a/system_test/replication_testsuite/testcase_0009/testcase_0009_properties.json
+++ b/system_test/replication_testsuite/testcase_0009/testcase_0009_properties.json
@@ -28,8 +28,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -37,8 +37,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -46,8 +46,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -67,7 +67,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0010/testcase_0010_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0010/testcase_0010_properties.json b/system_test/replication_testsuite/testcase_0010/testcase_0010_properties.json
index 781b752..218a7c6 100644
--- a/system_test/replication_testsuite/testcase_0010/testcase_0010_properties.json
+++ b/system_test/replication_testsuite/testcase_0010/testcase_0010_properties.json
@@ -28,8 +28,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "1048576",
+      "broker.id": "1",
+      "log.segment.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -37,8 +37,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "1048576",
+      "broker.id": "2",
+      "log.segment.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -46,8 +46,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "1048576",
+      "broker.id": "3",
+      "log.segment.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -67,7 +67,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0021/testcase_0021_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0021/testcase_0021_properties.json b/system_test/replication_testsuite/testcase_0021/testcase_0021_properties.json
index f9dbcd1..5b414d6 100644
--- a/system_test/replication_testsuite/testcase_0021/testcase_0021_properties.json
+++ b/system_test/replication_testsuite/testcase_0021/testcase_0021_properties.json
@@ -27,8 +27,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -36,8 +36,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -45,8 +45,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -78,7 +78,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -86,7 +86,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0022/testcase_0022_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0022/testcase_0022_properties.json b/system_test/replication_testsuite/testcase_0022/testcase_0022_properties.json
index 8eca849..9a60436 100644
--- a/system_test/replication_testsuite/testcase_0022/testcase_0022_properties.json
+++ b/system_test/replication_testsuite/testcase_0022/testcase_0022_properties.json
@@ -27,8 +27,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -36,8 +36,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -45,8 +45,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -78,7 +78,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -86,7 +86,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0023/testcase_0023_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0023/testcase_0023_properties.json b/system_test/replication_testsuite/testcase_0023/testcase_0023_properties.json
index aa346b6..33abd17 100644
--- a/system_test/replication_testsuite/testcase_0023/testcase_0023_properties.json
+++ b/system_test/replication_testsuite/testcase_0023/testcase_0023_properties.json
@@ -27,8 +27,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "512000",
+      "broker.id": "1",
+      "log.segment.size": "512000",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -36,8 +36,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "512000",
+      "broker.id": "2",
+      "log.segment.size": "512000",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -45,8 +45,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "512000",
+      "broker.id": "3",
+      "log.segment.size": "512000",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -78,7 +78,7 @@
     {
       "entity_id": "6",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_6.log",
       "config_filename": "console_consumer_6.properties"
@@ -86,7 +86,7 @@
     {
       "entity_id": "7",
       "topic": "test_2",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "log_filename": "console_consumer_7.log",
       "config_filename": "console_consumer_7.properties"

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0101/testcase_0101_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0101/testcase_0101_properties.json b/system_test/replication_testsuite/testcase_0101/testcase_0101_properties.json
index a4b6542..07776ae 100644
--- a/system_test/replication_testsuite/testcase_0101/testcase_0101_properties.json
+++ b/system_test/replication_testsuite/testcase_0101/testcase_0101_properties.json
@@ -31,8 +31,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -40,8 +40,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -49,8 +49,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -70,7 +70,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0102/testcase_0102_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0102/testcase_0102_properties.json b/system_test/replication_testsuite/testcase_0102/testcase_0102_properties.json
index 6e800b0..79211f1 100644
--- a/system_test/replication_testsuite/testcase_0102/testcase_0102_properties.json
+++ b/system_test/replication_testsuite/testcase_0102/testcase_0102_properties.json
@@ -31,8 +31,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -40,8 +40,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -49,8 +49,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -70,7 +70,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0103/testcase_0103_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0103/testcase_0103_properties.json b/system_test/replication_testsuite/testcase_0103/testcase_0103_properties.json
index 0447121..45d5578 100644
--- a/system_test/replication_testsuite/testcase_0103/testcase_0103_properties.json
+++ b/system_test/replication_testsuite/testcase_0103/testcase_0103_properties.json
@@ -31,8 +31,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -40,8 +40,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -49,8 +49,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -70,7 +70,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0104/testcase_0104_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0104/testcase_0104_properties.json b/system_test/replication_testsuite/testcase_0104/testcase_0104_properties.json
index ee0fb62..b793608 100644
--- a/system_test/replication_testsuite/testcase_0104/testcase_0104_properties.json
+++ b/system_test/replication_testsuite/testcase_0104/testcase_0104_properties.json
@@ -31,8 +31,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -40,8 +40,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -49,8 +49,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -70,7 +70,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0105/testcase_0105_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0105/testcase_0105_properties.json b/system_test/replication_testsuite/testcase_0105/testcase_0105_properties.json
index 4bc4c0a..7171b42 100644
--- a/system_test/replication_testsuite/testcase_0105/testcase_0105_properties.json
+++ b/system_test/replication_testsuite/testcase_0105/testcase_0105_properties.json
@@ -31,8 +31,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -40,8 +40,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -49,8 +49,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -70,7 +70,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0106/testcase_0106_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0106/testcase_0106_properties.json b/system_test/replication_testsuite/testcase_0106/testcase_0106_properties.json
index 1f10aa6..1b909a3 100644
--- a/system_test/replication_testsuite/testcase_0106/testcase_0106_properties.json
+++ b/system_test/replication_testsuite/testcase_0106/testcase_0106_properties.json
@@ -31,8 +31,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -40,8 +40,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -49,8 +49,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -70,7 +70,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0107/testcase_0107_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0107/testcase_0107_properties.json b/system_test/replication_testsuite/testcase_0107/testcase_0107_properties.json
index 79efc02..8d13531 100644
--- a/system_test/replication_testsuite/testcase_0107/testcase_0107_properties.json
+++ b/system_test/replication_testsuite/testcase_0107/testcase_0107_properties.json
@@ -31,8 +31,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -40,8 +40,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -49,8 +49,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -70,7 +70,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0108/testcase_0108_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0108/testcase_0108_properties.json b/system_test/replication_testsuite/testcase_0108/testcase_0108_properties.json
index 9c71cbf..9017e6b 100644
--- a/system_test/replication_testsuite/testcase_0108/testcase_0108_properties.json
+++ b/system_test/replication_testsuite/testcase_0108/testcase_0108_properties.json
@@ -31,8 +31,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -40,8 +40,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -49,8 +49,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -70,7 +70,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0109/testcase_0109_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0109/testcase_0109_properties.json b/system_test/replication_testsuite/testcase_0109/testcase_0109_properties.json
index 87aa327..0654620 100644
--- a/system_test/replication_testsuite/testcase_0109/testcase_0109_properties.json
+++ b/system_test/replication_testsuite/testcase_0109/testcase_0109_properties.json
@@ -31,8 +31,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "10240",
+      "broker.id": "1",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -40,8 +40,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "10240",
+      "broker.id": "2",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -49,8 +49,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "10240",
+      "broker.id": "3",
+      "log.segment.size": "10240",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -70,7 +70,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0110/testcase_0110_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0110/testcase_0110_properties.json b/system_test/replication_testsuite/testcase_0110/testcase_0110_properties.json
index 408cea0..24b33b6 100644
--- a/system_test/replication_testsuite/testcase_0110/testcase_0110_properties.json
+++ b/system_test/replication_testsuite/testcase_0110/testcase_0110_properties.json
@@ -31,8 +31,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "1048576",
+      "broker.id": "1",
+      "log.segment.size": "1048576",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -40,8 +40,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "1048576",
+      "broker.id": "2",
+      "log.segment.size": "1048576",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -49,8 +49,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "1048576",
+      "broker.id": "3",
+      "log.segment.size": "1048576",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -70,7 +70,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0111/testcase_0111_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0111/testcase_0111_properties.json b/system_test/replication_testsuite/testcase_0111/testcase_0111_properties.json
index 7eac232..0f7700e 100644
--- a/system_test/replication_testsuite/testcase_0111/testcase_0111_properties.json
+++ b/system_test/replication_testsuite/testcase_0111/testcase_0111_properties.json
@@ -31,8 +31,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -40,8 +40,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -49,8 +49,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -70,7 +70,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0112/testcase_0112_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0112/testcase_0112_properties.json b/system_test/replication_testsuite/testcase_0112/testcase_0112_properties.json
index c8f8341..4e9c03c 100644
--- a/system_test/replication_testsuite/testcase_0112/testcase_0112_properties.json
+++ b/system_test/replication_testsuite/testcase_0112/testcase_0112_properties.json
@@ -31,8 +31,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -40,8 +40,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -49,8 +49,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -70,7 +70,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0113/testcase_0113_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0113/testcase_0113_properties.json b/system_test/replication_testsuite/testcase_0113/testcase_0113_properties.json
index 62bd7ac..358abbe 100644
--- a/system_test/replication_testsuite/testcase_0113/testcase_0113_properties.json
+++ b/system_test/replication_testsuite/testcase_0113/testcase_0113_properties.json
@@ -31,8 +31,8 @@
     {
       "entity_id": "1",
       "port": "9091",
-      "brokerid": "1",
-      "log.file.size": "102400",
+      "broker.id": "1",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_1_logs",
       "log_filename": "kafka_server_9091.log",
       "config_filename": "kafka_server_9091.properties"
@@ -40,8 +40,8 @@
     {
       "entity_id": "2",
       "port": "9092",
-      "brokerid": "2",
-      "log.file.size": "102400",
+      "broker.id": "2",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_2_logs",
       "log_filename": "kafka_server_9092.log",
       "config_filename": "kafka_server_9092.properties"
@@ -49,8 +49,8 @@
     {
       "entity_id": "3",
       "port": "9093",
-      "brokerid": "3",
-      "log.file.size": "102400",
+      "broker.id": "3",
+      "log.segment.size": "102400",
       "log.dir": "/tmp/kafka_server_3_logs",
       "log_filename": "kafka_server_9093.log",
       "config_filename": "kafka_server_9093.properties"
@@ -70,7 +70,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",


Mime
View raw message