Reorganize and document the properties file.
diff --git a/docs/qakka-example.properties b/docs/qakka-example.properties
index 6756042..818db89 100644
--- a/docs/qakka-example.properties
+++ b/docs/qakka-example.properties
@@ -18,6 +18,11 @@
# Example Usergrid Qakka Queue System Configuration
+# When Qakka starts up it looks for this file, which must be named
+# "qakka.properties" in the Java classpath. On Tomcat you should be
+# able to place this file in the lib directory.
+
+
#------------------------------------------------------------------------------
# Usergrid Cassandra config
diff --git a/src/test/resources/qakka.properties b/src/test/resources/qakka.properties
index 94bfeff..6a13ad8 100644
--- a/src/test/resources/qakka.properties
+++ b/src/test/resources/qakka.properties
@@ -16,45 +16,10 @@
# under the License.
-# Properties for JUnit tests
+# Usergrid Qakka Queue System JUnit test configuration
-queue.standalone=true
-
-usergrid.cluster_name=Test Cluster
-
-usergrid.cluster.hostname=localhost
-
-# Comma-separated list of regions to be considered
-usergrid.cluster.region.list=us-east
-
-# The regions of this local instance of Usergrid
-usergrid.cluster.region.local=us-east
-
-# Comma-separated lists of cluster seeds each with format {region}:{hostname}
-usergrid.cluster.seeds=us-east:localhost
-
-# Port used for cluster communications.
-usergrid.cluster.port=3545
-
-queue.inmemory.cache=true
-
-queue.num.actors=50
-queue.sender.num.actors=100
-queue.writer.num.actors=100
-
-queue.send.timeout.seconds=5
-queue.get.timeout.seconds=5
-
-# set shard size and times low for testing purposes
-queue.shard.max.size=10
-queue.shard.allocation.check.frequency.millis=1000
-queue.shard.allocation.advance.time.millis=200
-
-# set low for testing purposes
-queue.shard.counter.max-in-memory=50
-queue.message.counter.max-in-memory=50
-
-queue.long.polling.time.millis=2000
+#------------------------------------------------------------------------------
+# Usergrid Cassandra config
cassandra.hosts=localhost
@@ -65,4 +30,59 @@
cassandra.keyspace-drop-and-create=true
#cassandra.connections=30
+
cassandra.timeout.pool=20000
+
+
+#------------------------------------------------------------------------------
+# Usergrid Cluster Config
+
+usergrid.cluster_name=Test Cluster
+
+usergrid.cluster.hostname=localhost
+
+usergrid.cluster.region.list=us-east
+
+usergrid.cluster.region.local=us-east
+
+usergrid.cluster.seeds=us-east:localhost
+
+usergrid.cluster.port=4551
+
+
+#------------------------------------------------------------------------------
+# Authentication config
+
+queue.auth.enabled=false
+
+
+#------------------------------------------------------------------------------
+# Queue System Config
+
+queue.standalone=true
+
+queue.inmemory.cache=true
+
+queue.num.actors=50
+
+queue.sender.num.actors=100
+
+queue.writer.num.actors=100
+
+queue.send.timeout.seconds=5
+
+queue.get.timeout.seconds=5
+
+# set shard size and times low for testing purposes
+queue.shard.max.size=10
+
+queue.shard.allocation.check.frequency.millis=1000
+
+queue.shard.allocation.advance.time.millis=200
+
+# set low for testing purposes
+queue.shard.counter.max-in-memory=50
+
+queue.message.counter.max-in-memory=50
+
+queue.long.polling.time.millis=2000
