modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java | 4 +++- modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-)
New commits: commit 231750d9a3f4a1e4216bdc74ee8acd3b8b2bd768 Author: Jay Shaughnessy jshaughn@redhat.com Date: Tue Sep 24 15:10:40 2013 -0400
fix an issue causing a server itest failure.
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml index 671853f..ebf7189 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml @@ -148,9 +148,9 @@
<data ID="62" PROPERTY_KEY="STORAGE_GOSSIP_PORT" FREAD_ONLY="TRUE"/>
- <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" FREAD_ONLY="TRUE"/> + <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/>
- <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" FREAD_ONLY="TRUE"/> + <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/>
</table>
commit 3adffa913e73cd163bc54513cd2f4711bd06a449 Author: Jay Shaughnessy jshaughn@redhat.com Date: Tue Sep 24 15:10:01 2013 -0400
fix an issue using -Ditest.use-external-storage-node with server itests.
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java index d051d9d..50aaab1 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java @@ -152,7 +152,9 @@ public class CCMSuiteDeploymentExtension implements LoadableExtension { String cqlPortString = System.getProperty("rhq.storage.cql-port", "9042"); cqlPort = Integer.parseInt(cqlPortString);
- //jmxPorts = parseNodeJmxPorts(seed); + String jmxPortString = System.getProperty("rhq.storage.jmx-port", "7299"); + jmxPorts = new int[] { Integer.parseInt(jmxPortString) }; + schemaManager = new SchemaManager("rhqadmin", "1eeb2f255e832171df8592078de921bc", nodes, cqlPort);
} catch (Exception e) {