modules/common/cassandra-common/src/main/java/org/rhq/cassandra/DeploymentOptions.java
| 2 +-
modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra.yaml
| 2 +-
modules/common/cassandra-common/src/main/resources/cassandra.properties
| 2 +-
modules/common/cassandra-common/src/main/resources/deploy.xml
| 2 +-
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
| 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 6dd02579a252191ddc43ef7358a532174add87dc
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Nov 29 21:41:00 2012 -0500
changing property name to be more consistent with other property names
diff --git
a/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/DeploymentOptions.java
b/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/DeploymentOptions.java
index da0f176..d15983e 100644
---
a/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/DeploymentOptions.java
+++
b/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/DeploymentOptions.java
@@ -94,7 +94,7 @@ public class DeploymentOptions {
setRingDelay(Long.valueOf(ringDelay));
}
-
setNumTokens(Integer.valueOf(loadProperty("rhq.cassandra.node.num-tokens",
properties)));
+ setNumTokens(Integer.valueOf(loadProperty("rhq.cassandra.num-tokens",
properties)));
setNativeTransportPort(Integer.valueOf(loadProperty("rhq.cassandra.native-transport-port",
properties)));
setNativeTransportMaxThreads(Integer.valueOf(loadProperty("rhq.casandra.native-transport-max-threads",
properties)));
diff --git
a/modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra.yaml
b/modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra.yaml
index d1cdc87..ae78ad2 100644
---
a/modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra.yaml
+++
b/modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra.yaml
@@ -21,7 +21,7 @@ cluster_name: @@cluster.name(a)@
#
# If you already have a cluster with 1 token per node, and wish to migrate to
# multiple tokens per node, see
http://wiki.apache.org/cassandra/Operations
-num_tokens: @@rhq.cassandra.node.num_tokens(a)@
+num_tokens: @@rhq.cassandra.num_tokens(a)@
# If you haven't specified num_tokens, or have set it to the default of 1 then
# you should always specify InitialToken when setting up a production
diff --git a/modules/common/cassandra-common/src/main/resources/cassandra.properties
b/modules/common/cassandra-common/src/main/resources/cassandra.properties
index d520f77..799584a 100644
--- a/modules/common/cassandra-common/src/main/resources/cassandra.properties
+++ b/modules/common/cassandra-common/src/main/resources/cassandra.properties
@@ -17,7 +17,7 @@ rhq.cassandra.bundle.version=1.0
# hardware capability. Tokens are randomly generated with the expectation of an even
# distribution. With that said, there can be some variation. Either increasing this
value
# or increasing the number of nodes in the cluster will help even out the distribution.
-rhq.cassandra.node.num-tokens=256
+rhq.cassandra.num-tokens=256
# The maximum number of threads handling native CQL requests.
rhq.casandra.native-transport-max-threads=64
diff --git a/modules/common/cassandra-common/src/main/resources/deploy.xml
b/modules/common/cassandra-common/src/main/resources/deploy.xml
index 3fa9e8a..69b02e9 100644
--- a/modules/common/cassandra-common/src/main/resources/deploy.xml
+++ b/modules/common/cassandra-common/src/main/resources/deploy.xml
@@ -67,7 +67,7 @@
defaultValue="127.0.0.1"
type="string"/>
- <rhq:input-property name="rhq.cassandra.node.num_tokens"
+ <rhq:input-property name="rhq.cassandra.num_tokens"
description="Defines the number of tokens randomly assigned
to a node on the ring. The more tokens, relative to other nodes, the larger the proportion
of data that this node will store. You probably want all nodes to have the same number of
tokens assuming they have equal hardware capability."
required="false"
defaultValue="256"
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index 3f60daf..42eb164 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -584,7 +584,7 @@ rhq.cassandra.cluster.seeds=
# with the expectation of an even distribution. With that said, there can be
# some variation. Either increasing this value or increasing the number of
# nodes in the cluster will help even out the distribution.
-rhq.cassandra.node.num-tokens=${rhq.cassandra.node.num-tokens}
+rhq.cassandra.num-tokens=${rhq.cassandra.num-tokens}
# The port for the CQL native transport to listen for clients on. Default value
# is 9042.