Permalink
Browse files

Refactored configuration (entailed renaming of all configuration keys…

…). Updates submodules after code style overhaul.
  • Loading branch information...
1 parent 0d8b02b commit d8c72c64b8704fa493cdd2d0fce61e7fc7dfdd88 @x1B committed Apr 12, 2011
Showing with 36 additions and 31 deletions.
  1. +29 −24 conf/defaults.json
  2. +5 −5 conf/grouperfish.json.example
  3. +1 −1 vendor/rest
  4. +1 −1 vendor/worker
View
@@ -1,35 +1,40 @@
-{ "//": "CAUTION: "
-, "//": "Do not change the defaults."
-, "//": "Either use ./grouperfish.json or specify your own config file"
-, "//": "on the command line when starting a grouperfish process."
-, "//": "The '//' entries are comments and can be omitted in your config."
+{ "": "CAUTION: Do not modify these defaults!",
+ "": "Either create ./grouperfish.json or use the --config option to ",
+ "": "specify a custom configuration when starting a grouperfish process!",
+ "": "The '' entries are comments and can be omitted in your config.",
-, "//": "The Grouperfish frontend will listen here."
-, "restPort": "8030"
+ "": "The Grouperfish frontend will listen here.",
+ "rest:port": "8030",
-, "//": "Spin up the hbase REST (stargate) service on this host."
-, "//": "For multiple servers you need to setup a reverse proxy."
-, "hbaseRest": "http://localhost:8080"
+ "": "Spin up the hbase REST (stargate) service on this host.",
+ "": "For multiple servers you need to setup a reverse proxy.",
+ "storage:hbase:rest": "http://localhost:8080",
-, "//": "Quorum members separated by comma"
-, "hbaseZk": "localhost:2181"
+ "": "Quorum members separated by comma",
+ "storage:hbase:zookeeper:quorum": "localhost:2181",
-, "//": "Redis host:port -- Currently not used"
-, "redis": ""
+ "": "Redis host:port -- Currently not used",
+ "storage:redis": "",
-, "//": "RabbitMQ broker host:port -- Currently not used"
-, "rabbitmq": ""
+ "": "RabbitMQ broker host:port -- Currently not used",
+ "messaging:rabbitmq": "",
-, "//": "Will be used to prefix all HBase table names Grouperfish uses."
-, "prefix": "grouperfish_"
+ "": "Used to prefix system-wide resources, such as HBase tables.",
+ "general:prefix": "grouperfish_",
-, "//": "Base directory for Grouperfish files in HDFS."
-, "dfsBase": "/grouperfish"
+ "": "Parent directory for all Grouperfish files in HDFS.",
+ "worker:dfs:root": "/grouperfish",
-, "//": "ADVANCED: row key generation scheme: 'simple' or 'reverse_parts'."
-, "keyScheme": "reverse_parts"
+ "": "ADVANCED: The pattern for row-key generation in HBase.",
+ "": "Options so far: 'SIMPLE' or 'REVERSE_PARTS'.",
+ "": "Scheme 'simple' is only recommended for testing and development.",
+ "storage:hbase:keys:scheme": "REVERSE_PARTS",
-, "//": "ADVANCED: znode for HBase. Use null for hbase default."
-, "hbaseZkNode": null
+ "": "ADVANCED: 'parent' znode for HBase. Use null for hbase default.",
+ "storage:hbase:zookeeper:znode": null,
+ "": "ADVANCED, INPUT SPECIFIC",
+ "": "For each input doc read, a doc is inserted into these collections",
+ "input:import:collections:patterns": ["$TYPE-$PRODUCT-$VERSION",
+ "$TYPE-$PRODUCT"]
}
@@ -1,8 +1,8 @@
-{ "//": "Grouperfish configuration"
-, "//": "Override values from defaults.json here as you see fit."
+{ "//": "Grouperfish configuration",
+ "//": "Override any values from defaults.json here as you see fit.",
-, "//": "Like this:"
+ "//": "Like this:",
-, "someString": "value"
-, "someNumber": 42
+ "rest:port": "1337",
+ "storage:hbase:zookeeper:znode": "/clusteringcluster"
}
Submodule rest updated from 23e76b to 8543c9

0 comments on commit d8c72c6

Please sign in to comment.