modules/common/cassandra-common/src/main/java/org/rhq/cassandra/DeploymentOptions.java
| 6 +-----
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(+), 9 deletions(-)
New commits:
commit a41c9a1a6e6b3a52a6ee7c208e8abd724ae1c8b3
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Nov 29 17:02:44 2012 -0500
fixing 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 7f77316..da0f176 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
@@ -55,10 +55,6 @@ public class DeploymentOptions {
public DeploymentOptions() {
}
- public DeploymentOptions(Properties properties) {
- init(properties);
- }
-
public void load() throws IOException {
InputStream stream = null;
try {
@@ -100,7 +96,7 @@ public class DeploymentOptions {
setNumTokens(Integer.valueOf(loadProperty("rhq.cassandra.node.num-tokens",
properties)));
setNativeTransportPort(Integer.valueOf(loadProperty("rhq.cassandra.native-transport-port",
properties)));
-
setNativeTransportMaxThreads(Integer.valueOf(loadProperty("rhq.casandra.node.native-transport-max-threads",
+
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 65a47aa..d1cdc87 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
@@ -312,7 +312,7 @@ start_native_transport: true
native_transport_port: @@rhq.cassandra.native_transport_port(a)@
# The maximum of thread handling requests. The meaning is the same than
# rpc_max_threads.
-native_transport_max_threads: @@rhq.casandra.node.native_transport_max_threads(a)@
+native_transport_max_threads: @@rhq.casandra.native_transport_max_threads(a)@
# Whether to start the thrift rpc server.
diff --git a/modules/common/cassandra-common/src/main/resources/cassandra.properties
b/modules/common/cassandra-common/src/main/resources/cassandra.properties
index afbbd7d..d520f77 100644
--- a/modules/common/cassandra-common/src/main/resources/cassandra.properties
+++ b/modules/common/cassandra-common/src/main/resources/cassandra.properties
@@ -20,7 +20,7 @@ rhq.cassandra.bundle.version=1.0
rhq.cassandra.node.num-tokens=256
# The maximum number of threads handling native CQL requests.
-rhq.casandra.node.native-transport-max-threads=64
+rhq.casandra.native-transport-max-threads=64
# The port for the CQL native transport to listen for clients on.
rhq.cassandra.native-transport-port=9042
diff --git a/modules/common/cassandra-common/src/main/resources/deploy.xml
b/modules/common/cassandra-common/src/main/resources/deploy.xml
index 9204f00..3fa9e8a 100644
--- a/modules/common/cassandra-common/src/main/resources/deploy.xml
+++ b/modules/common/cassandra-common/src/main/resources/deploy.xml
@@ -108,7 +108,7 @@
defaultValue=""
type="string"/>
- <rhq:input-property
name="rhq.casandra.node.native_transport_max_threads"
+ <rhq:input-property name="rhq.casandra.native_transport_max_threads"
description="The maximum number of threads handling native
CQL requests."
required="false"
defaultValue="64"
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 907aa24..3f60daf 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
@@ -591,7 +591,7 @@ rhq.cassandra.node.num-tokens=${rhq.cassandra.node.num-tokens}
rhq.cassandra.native-transport-port=${rhq.cassandra.native-transport-port}
# The maximum number of threads handling native CQL requests. The default value is 64.
-rhq.casandra.node.native-transport-max-threads=${rhq.casandra.node.native-transport-max-threads}
+rhq.casandra.native-transport-max-threads=${rhq.casandra.native-transport-max-threads}
</echo>
</target>
Show replies by date