Author: [email protected]
Date: Fri Jun 22 16:47:58 2012
New Revision: 2529
Log:
[AMDATUCASSANDRA-212] Added tokenprovider config
Modified:
branches/amdatu-cassandra-0.2.5/test-integration/base/src/main/java/org/amdatu/cassandra/test/integration/base/CassandraFixture.java
Modified:
branches/amdatu-cassandra-0.2.5/test-integration/base/src/main/java/org/amdatu/cassandra/test/integration/base/CassandraFixture.java
==============================================================================
---
branches/amdatu-cassandra-0.2.5/test-integration/base/src/main/java/org/amdatu/cassandra/test/integration/base/CassandraFixture.java
(original)
+++
branches/amdatu-cassandra-0.2.5/test-integration/base/src/main/java/org/amdatu/cassandra/test/integration/base/CassandraFixture.java
Fri Jun 22 16:47:58 2012
@@ -40,8 +40,9 @@
* The port to use during the integration test.
*/
public static final String PORTNR = "8080";
-
+
private static final String USERADMIN_PID =
"org.amdatu.auth.useradmin.rest";
+ private static final String TOKENPROVIDER_PID =
"org.amdatu.auth.tokenprovider";
public Option provision() {
return org.ops4j.pax.exam.CoreOptions.provision(
@@ -105,6 +106,7 @@
configureCassandra(testContext);
configureHttpService(testContext);
configureUserAdmin(testContext);
+ configureTokenProvider(testContext);
}
public void configureCassandra(final TestContext testContext) throws
Exception {
@@ -122,6 +124,10 @@
testContext.updateConfig(USERADMIN_PID, getUserAdminCfg());
}
+ private void configureTokenProvider(final TestContext testContext) throws
Exception {
+ testContext.updateConfig(TOKENPROVIDER_PID, getTokenProviderCfg());
+ }
+
private Properties getCassandraServerConfig() {
Properties properties = new Properties();
properties.put("workdir", "cassandra");
@@ -160,6 +166,12 @@
return properties;
}
+ private Properties getTokenProviderCfg() {
+ Properties properties = new Properties();
+ properties.put("secretkey", "[randomkey]");
+ return properties;
+ }
+
private Properties getCassandraHectorPMConfig() {
Properties properties = new Properties();
properties.put("rpc_address", "localhost");
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
