You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ju...@apache.org on 2013/01/14 23:31:43 UTC

[3/5] System Test - Update all testcase_xxxx_properties.json for properties keys uniform naming convention; kafka-688; patched by Jun Rao; reviewed by Jun Rao

http://git-wip-us.apache.org/repos/asf/kafka/blob/bd5504c0/system_test/replication_testsuite/testcase_0114/testcase_0114_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0114/testcase_0114_properties.json b/system_test/replication_testsuite/testcase_0114/testcase_0114_properties.json
index 1dfb44c..053f17c 100644
--- a/system_test/replication_testsuite/testcase_0114/testcase_0114_properties.json
+++ b/system_test/replication_testsuite/testcase_0114/testcase_0114_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_0115/testcase_0115_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0115/testcase_0115_properties.json b/system_test/replication_testsuite/testcase_0115/testcase_0115_properties.json
index 2a35459..0a30580 100644
--- a/system_test/replication_testsuite/testcase_0115/testcase_0115_properties.json
+++ b/system_test/replication_testsuite/testcase_0115/testcase_0115_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_0116/testcase_0116_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0116/testcase_0116_properties.json b/system_test/replication_testsuite/testcase_0116/testcase_0116_properties.json
index 981b7ba..b1e4eb2 100644
--- a/system_test/replication_testsuite/testcase_0116/testcase_0116_properties.json
+++ b/system_test/replication_testsuite/testcase_0116/testcase_0116_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_0117/testcase_0117_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0117/testcase_0117_properties.json b/system_test/replication_testsuite/testcase_0117/testcase_0117_properties.json
index 5ffc05c..f395fe7 100644
--- a/system_test/replication_testsuite/testcase_0117/testcase_0117_properties.json
+++ b/system_test/replication_testsuite/testcase_0117/testcase_0117_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_0118/testcase_0118_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0118/testcase_0118_properties.json b/system_test/replication_testsuite/testcase_0118/testcase_0118_properties.json
index 3df80f8..7d2ed9a 100644
--- a/system_test/replication_testsuite/testcase_0118/testcase_0118_properties.json
+++ b/system_test/replication_testsuite/testcase_0118/testcase_0118_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_0121/testcase_0121_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0121/testcase_0121_properties.json b/system_test/replication_testsuite/testcase_0121/testcase_0121_properties.json
index f61b3c4..bdc17ce 100644
--- a/system_test/replication_testsuite/testcase_0121/testcase_0121_properties.json
+++ b/system_test/replication_testsuite/testcase_0121/testcase_0121_properties.json
@@ -30,8 +30,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"
@@ -39,8 +39,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"
@@ -48,8 +48,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"
@@ -81,7 +81,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"
@@ -89,7 +89,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_0122/testcase_0122_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0122/testcase_0122_properties.json b/system_test/replication_testsuite/testcase_0122/testcase_0122_properties.json
index aeee0f9..8f00df6 100644
--- a/system_test/replication_testsuite/testcase_0122/testcase_0122_properties.json
+++ b/system_test/replication_testsuite/testcase_0122/testcase_0122_properties.json
@@ -30,8 +30,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"
@@ -39,8 +39,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"
@@ -48,8 +48,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"
@@ -81,7 +81,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"
@@ -89,7 +89,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_0123/testcase_0123_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0123/testcase_0123_properties.json b/system_test/replication_testsuite/testcase_0123/testcase_0123_properties.json
index 0156c04..6de5d62 100644
--- a/system_test/replication_testsuite/testcase_0123/testcase_0123_properties.json
+++ b/system_test/replication_testsuite/testcase_0123/testcase_0123_properties.json
@@ -30,8 +30,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"
@@ -39,8 +39,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"
@@ -48,8 +48,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"
@@ -81,7 +81,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"
@@ -89,7 +89,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_0124/testcase_0124_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0124/testcase_0124_properties.json b/system_test/replication_testsuite/testcase_0124/testcase_0124_properties.json
index 0c37504..fe9e545 100644
--- a/system_test/replication_testsuite/testcase_0124/testcase_0124_properties.json
+++ b/system_test/replication_testsuite/testcase_0124/testcase_0124_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.index.interval.bytes": "490",
       "log_filename": "kafka_server_9091.log",
@@ -41,8 +41,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.index.interval.bytes": "490",
       "log_filename": "kafka_server_9092.log",
@@ -51,8 +51,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.index.interval.bytes": "490",
       "log_filename": "kafka_server_9093.log",
@@ -85,7 +85,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"
@@ -93,7 +93,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_0125/testcase_0125_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0125/testcase_0125_properties.json b/system_test/replication_testsuite/testcase_0125/testcase_0125_properties.json
index bfc28c6..8085d7d 100644
--- a/system_test/replication_testsuite/testcase_0125/testcase_0125_properties.json
+++ b/system_test/replication_testsuite/testcase_0125/testcase_0125_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.index.interval.bytes": "490",
       "log_filename": "kafka_server_9091.log",
@@ -41,8 +41,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.index.interval.bytes": "490",
       "log_filename": "kafka_server_9092.log",
@@ -51,8 +51,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.index.interval.bytes": "490",
       "log_filename": "kafka_server_9093.log",
@@ -85,7 +85,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"
@@ -93,7 +93,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_0126/testcase_0126_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0126/testcase_0126_properties.json b/system_test/replication_testsuite/testcase_0126/testcase_0126_properties.json
index 3e0a2ba..31afba3 100644
--- a/system_test/replication_testsuite/testcase_0126/testcase_0126_properties.json
+++ b/system_test/replication_testsuite/testcase_0126/testcase_0126_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.index.interval.bytes": "490",
       "log_filename": "kafka_server_9091.log",
@@ -41,8 +41,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.index.interval.bytes": "490",
       "log_filename": "kafka_server_9092.log",
@@ -51,8 +51,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.index.interval.bytes": "490",
       "log_filename": "kafka_server_9093.log",
@@ -85,7 +85,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"
@@ -93,7 +93,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_0127/testcase_0127_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0127/testcase_0127_properties.json b/system_test/replication_testsuite/testcase_0127/testcase_0127_properties.json
index 4357471..12daea9 100644
--- a/system_test/replication_testsuite/testcase_0127/testcase_0127_properties.json
+++ b/system_test/replication_testsuite/testcase_0127/testcase_0127_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.index.interval.bytes": "490",
       "log_filename": "kafka_server_9091.log",
@@ -41,8 +41,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.index.interval.bytes": "490",
       "log_filename": "kafka_server_9092.log",
@@ -51,8 +51,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.index.interval.bytes": "490",
       "log_filename": "kafka_server_9093.log",
@@ -85,7 +85,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"
@@ -93,7 +93,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_0131/testcase_0131_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0131/testcase_0131_properties.json b/system_test/replication_testsuite/testcase_0131/testcase_0131_properties.json
index c713706..99b6bf8 100644
--- a/system_test/replication_testsuite/testcase_0131/testcase_0131_properties.json
+++ b/system_test/replication_testsuite/testcase_0131/testcase_0131_properties.json
@@ -30,8 +30,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.index.interval.bytes": "10",
       "log_filename": "kafka_server_9091.log",
@@ -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.index.interval.bytes": "10",
       "log_filename": "kafka_server_9092.log",
@@ -50,8 +50,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.index.interval.bytes": "10",
       "log_filename": "kafka_server_9093.log",
@@ -84,7 +84,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"
@@ -92,7 +92,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_0132/testcase_0132_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0132/testcase_0132_properties.json b/system_test/replication_testsuite/testcase_0132/testcase_0132_properties.json
index 4661408..93c1955 100644
--- a/system_test/replication_testsuite/testcase_0132/testcase_0132_properties.json
+++ b/system_test/replication_testsuite/testcase_0132/testcase_0132_properties.json
@@ -30,8 +30,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"
@@ -39,8 +39,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"
@@ -48,8 +48,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"
@@ -81,7 +81,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"
@@ -89,7 +89,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_0133/testcase_0133_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0133/testcase_0133_properties.json b/system_test/replication_testsuite/testcase_0133/testcase_0133_properties.json
index 12bb844..c930d86 100644
--- a/system_test/replication_testsuite/testcase_0133/testcase_0133_properties.json
+++ b/system_test/replication_testsuite/testcase_0133/testcase_0133_properties.json
@@ -30,8 +30,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"
@@ -39,8 +39,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"
@@ -48,8 +48,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"
@@ -81,7 +81,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"
@@ -89,7 +89,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_0151/testcase_0151_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0151/testcase_0151_properties.json b/system_test/replication_testsuite/testcase_0151/testcase_0151_properties.json
index cf4f2a2..a30443d 100644
--- a/system_test/replication_testsuite/testcase_0151/testcase_0151_properties.json
+++ b/system_test/replication_testsuite/testcase_0151/testcase_0151_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -72,7 +72,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_0152/testcase_0152_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0152/testcase_0152_properties.json b/system_test/replication_testsuite/testcase_0152/testcase_0152_properties.json
index b365b47..1b9cca2 100644
--- a/system_test/replication_testsuite/testcase_0152/testcase_0152_properties.json
+++ b/system_test/replication_testsuite/testcase_0152/testcase_0152_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -72,7 +72,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_0153/testcase_0153_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0153/testcase_0153_properties.json b/system_test/replication_testsuite/testcase_0153/testcase_0153_properties.json
index e25e06e..d45327f 100644
--- a/system_test/replication_testsuite/testcase_0153/testcase_0153_properties.json
+++ b/system_test/replication_testsuite/testcase_0153/testcase_0153_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -72,7 +72,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_0154/testcase_0154_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0154/testcase_0154_properties.json b/system_test/replication_testsuite/testcase_0154/testcase_0154_properties.json
index a1a65b6..09678a7 100644
--- a/system_test/replication_testsuite/testcase_0154/testcase_0154_properties.json
+++ b/system_test/replication_testsuite/testcase_0154/testcase_0154_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -72,7 +72,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_0155/testcase_0155_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0155/testcase_0155_properties.json b/system_test/replication_testsuite/testcase_0155/testcase_0155_properties.json
index 7462bd6..27f6083 100644
--- a/system_test/replication_testsuite/testcase_0155/testcase_0155_properties.json
+++ b/system_test/replication_testsuite/testcase_0155/testcase_0155_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -72,7 +72,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_0156/testcase_0156_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0156/testcase_0156_properties.json b/system_test/replication_testsuite/testcase_0156/testcase_0156_properties.json
index fec27f6..645573a 100644
--- a/system_test/replication_testsuite/testcase_0156/testcase_0156_properties.json
+++ b/system_test/replication_testsuite/testcase_0156/testcase_0156_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -72,7 +72,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_0157/testcase_0157_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0157/testcase_0157_properties.json b/system_test/replication_testsuite/testcase_0157/testcase_0157_properties.json
index aea1ff9..565372d 100644
--- a/system_test/replication_testsuite/testcase_0157/testcase_0157_properties.json
+++ b/system_test/replication_testsuite/testcase_0157/testcase_0157_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -72,7 +72,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_0158/testcase_0158_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0158/testcase_0158_properties.json b/system_test/replication_testsuite/testcase_0158/testcase_0158_properties.json
index b7cec97..e172728 100644
--- a/system_test/replication_testsuite/testcase_0158/testcase_0158_properties.json
+++ b/system_test/replication_testsuite/testcase_0158/testcase_0158_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -72,7 +72,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_0201/testcase_0201_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0201/testcase_0201_properties.json b/system_test/replication_testsuite/testcase_0201/testcase_0201_properties.json
index 697a99c..637e860 100644
--- a/system_test/replication_testsuite/testcase_0201/testcase_0201_properties.json
+++ b/system_test/replication_testsuite/testcase_0201/testcase_0201_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -71,7 +71,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_0202/testcase_0202_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0202/testcase_0202_properties.json b/system_test/replication_testsuite/testcase_0202/testcase_0202_properties.json
index d180a68..8057d23 100644
--- a/system_test/replication_testsuite/testcase_0202/testcase_0202_properties.json
+++ b/system_test/replication_testsuite/testcase_0202/testcase_0202_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -71,7 +71,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_0203/testcase_0203_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0203/testcase_0203_properties.json b/system_test/replication_testsuite/testcase_0203/testcase_0203_properties.json
index 71e1672..4a071e0 100644
--- a/system_test/replication_testsuite/testcase_0203/testcase_0203_properties.json
+++ b/system_test/replication_testsuite/testcase_0203/testcase_0203_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -71,7 +71,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_0204/testcase_0204_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0204/testcase_0204_properties.json b/system_test/replication_testsuite/testcase_0204/testcase_0204_properties.json
index a33b02f..05b758b 100644
--- a/system_test/replication_testsuite/testcase_0204/testcase_0204_properties.json
+++ b/system_test/replication_testsuite/testcase_0204/testcase_0204_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -71,7 +71,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_0205/testcase_0205_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0205/testcase_0205_properties.json b/system_test/replication_testsuite/testcase_0205/testcase_0205_properties.json
index 865b6e8..1b4b204 100644
--- a/system_test/replication_testsuite/testcase_0205/testcase_0205_properties.json
+++ b/system_test/replication_testsuite/testcase_0205/testcase_0205_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -71,7 +71,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_0206/testcase_0206_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0206/testcase_0206_properties.json b/system_test/replication_testsuite/testcase_0206/testcase_0206_properties.json
index fdab427..d5ba204 100644
--- a/system_test/replication_testsuite/testcase_0206/testcase_0206_properties.json
+++ b/system_test/replication_testsuite/testcase_0206/testcase_0206_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -71,7 +71,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_0207/testcase_0207_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0207/testcase_0207_properties.json b/system_test/replication_testsuite/testcase_0207/testcase_0207_properties.json
index 2510553..ac72c88 100644
--- a/system_test/replication_testsuite/testcase_0207/testcase_0207_properties.json
+++ b/system_test/replication_testsuite/testcase_0207/testcase_0207_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -71,7 +71,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_0208/testcase_0208_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0208/testcase_0208_properties.json b/system_test/replication_testsuite/testcase_0208/testcase_0208_properties.json
index 655b753..e840880 100644
--- a/system_test/replication_testsuite/testcase_0208/testcase_0208_properties.json
+++ b/system_test/replication_testsuite/testcase_0208/testcase_0208_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -71,7 +71,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_0251/testcase_0251_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0251/testcase_0251_properties.json b/system_test/replication_testsuite/testcase_0251/testcase_0251_properties.json
index 84ee449..0968cd8 100644
--- a/system_test/replication_testsuite/testcase_0251/testcase_0251_properties.json
+++ b/system_test/replication_testsuite/testcase_0251/testcase_0251_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -71,7 +71,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_0252/testcase_0252_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0252/testcase_0252_properties.json b/system_test/replication_testsuite/testcase_0252/testcase_0252_properties.json
index bcd07ce..49e44f5 100644
--- a/system_test/replication_testsuite/testcase_0252/testcase_0252_properties.json
+++ b/system_test/replication_testsuite/testcase_0252/testcase_0252_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -71,7 +71,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_0253/testcase_0253_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0253/testcase_0253_properties.json b/system_test/replication_testsuite/testcase_0253/testcase_0253_properties.json
index a7cfea3..eac08a4 100644
--- a/system_test/replication_testsuite/testcase_0253/testcase_0253_properties.json
+++ b/system_test/replication_testsuite/testcase_0253/testcase_0253_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -71,7 +71,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_0254/testcase_0254_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0254/testcase_0254_properties.json b/system_test/replication_testsuite/testcase_0254/testcase_0254_properties.json
index 82fd2fa..338abcb 100644
--- a/system_test/replication_testsuite/testcase_0254/testcase_0254_properties.json
+++ b/system_test/replication_testsuite/testcase_0254/testcase_0254_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -71,7 +71,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_0255/testcase_0255_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0255/testcase_0255_properties.json b/system_test/replication_testsuite/testcase_0255/testcase_0255_properties.json
index 88744c5..bf06af9 100644
--- a/system_test/replication_testsuite/testcase_0255/testcase_0255_properties.json
+++ b/system_test/replication_testsuite/testcase_0255/testcase_0255_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -71,7 +71,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_0256/testcase_0256_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0256/testcase_0256_properties.json b/system_test/replication_testsuite/testcase_0256/testcase_0256_properties.json
index b34d395..946667a 100644
--- a/system_test/replication_testsuite/testcase_0256/testcase_0256_properties.json
+++ b/system_test/replication_testsuite/testcase_0256/testcase_0256_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -71,7 +71,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_0257/testcase_0257_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0257/testcase_0257_properties.json b/system_test/replication_testsuite/testcase_0257/testcase_0257_properties.json
index 003b564..ee88b58 100644
--- a/system_test/replication_testsuite/testcase_0257/testcase_0257_properties.json
+++ b/system_test/replication_testsuite/testcase_0257/testcase_0257_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -71,7 +71,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_0258/testcase_0258_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0258/testcase_0258_properties.json b/system_test/replication_testsuite/testcase_0258/testcase_0258_properties.json
index 7f85963..2bb1af5 100644
--- a/system_test/replication_testsuite/testcase_0258/testcase_0258_properties.json
+++ b/system_test/replication_testsuite/testcase_0258/testcase_0258_properties.json
@@ -32,8 +32,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"
@@ -41,8 +41,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"
@@ -50,8 +50,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"
@@ -71,7 +71,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_0301/testcase_0301_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0301/testcase_0301_properties.json b/system_test/replication_testsuite/testcase_0301/testcase_0301_properties.json
index 481918d..f5099a3 100644
--- a/system_test/replication_testsuite/testcase_0301/testcase_0301_properties.json
+++ b/system_test/replication_testsuite/testcase_0301/testcase_0301_properties.json
@@ -30,8 +30,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"
@@ -39,8 +39,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"
@@ -48,8 +48,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"
@@ -69,7 +69,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_0302/testcase_0302_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0302/testcase_0302_properties.json b/system_test/replication_testsuite/testcase_0302/testcase_0302_properties.json
index 3629728..b8f6fa0 100644
--- a/system_test/replication_testsuite/testcase_0302/testcase_0302_properties.json
+++ b/system_test/replication_testsuite/testcase_0302/testcase_0302_properties.json
@@ -30,8 +30,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"
@@ -39,8 +39,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"
@@ -48,8 +48,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"
@@ -69,7 +69,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_0303/testcase_0303_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0303/testcase_0303_properties.json b/system_test/replication_testsuite/testcase_0303/testcase_0303_properties.json
index 93657d1..1da345d 100644
--- a/system_test/replication_testsuite/testcase_0303/testcase_0303_properties.json
+++ b/system_test/replication_testsuite/testcase_0303/testcase_0303_properties.json
@@ -30,8 +30,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"
@@ -39,8 +39,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"
@@ -48,8 +48,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"
@@ -69,7 +69,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_0304/testcase_0304_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0304/testcase_0304_properties.json b/system_test/replication_testsuite/testcase_0304/testcase_0304_properties.json
index a989afd..d8cb0c1 100644
--- a/system_test/replication_testsuite/testcase_0304/testcase_0304_properties.json
+++ b/system_test/replication_testsuite/testcase_0304/testcase_0304_properties.json
@@ -30,8 +30,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"
@@ -39,8 +39,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"
@@ -48,8 +48,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"
@@ -69,7 +69,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_0305/testcase_0305_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0305/testcase_0305_properties.json b/system_test/replication_testsuite/testcase_0305/testcase_0305_properties.json
index 04b2f94..e3e9721 100644
--- a/system_test/replication_testsuite/testcase_0305/testcase_0305_properties.json
+++ b/system_test/replication_testsuite/testcase_0305/testcase_0305_properties.json
@@ -30,8 +30,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"
@@ -39,8 +39,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"
@@ -48,8 +48,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"
@@ -69,7 +69,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_0306/testcase_0306_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0306/testcase_0306_properties.json b/system_test/replication_testsuite/testcase_0306/testcase_0306_properties.json
index 3061c5d..7040165 100644
--- a/system_test/replication_testsuite/testcase_0306/testcase_0306_properties.json
+++ b/system_test/replication_testsuite/testcase_0306/testcase_0306_properties.json
@@ -30,8 +30,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"
@@ -39,8 +39,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"
@@ -48,8 +48,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"
@@ -69,7 +69,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_0307/testcase_0307_properties.json
----------------------------------------------------------------------
diff --git a/system_test/replication_testsuite/testcase_0307/testcase_0307_properties.json b/system_test/replication_testsuite/testcase_0307/testcase_0307_properties.json
index 3241e0c..cf87372 100644
--- a/system_test/replication_testsuite/testcase_0307/testcase_0307_properties.json
+++ b/system_test/replication_testsuite/testcase_0307/testcase_0307_properties.json
@@ -30,8 +30,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"
@@ -39,8 +39,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"
@@ -48,8 +48,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"
@@ -69,7 +69,7 @@
     {
       "entity_id": "5",
       "topic": "test_1",
-      "groupid": "mytestgroup",
+      "group.id": "mytestgroup",
       "consumer-timeout-ms": "10000",
       "zookeeper": "localhost:2188",
       "log_filename": "console_consumer.log",