[Amdatu-commits] SVN r2527 - in branches/amdatu-cassandra-0.2.5: . test-integration test-integration/base/src/main/java/org/amdatu/cassandra/test/integration/base

[subversion]

Author: ivo...@gmail.com
Date: Fri Jun 22 16:40:37 2012
New Revision: 2527

Log:
[AMDATUCASSANDRA-212] Updated Auth

Modified:
   branches/amdatu-cassandra-0.2.5/pom.xml
   
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/pom.xml

Modified: branches/amdatu-cassandra-0.2.5/pom.xml
==============================================================================
--- branches/amdatu-cassandra-0.2.5/pom.xml     (original)
+++ branches/amdatu-cassandra-0.2.5/pom.xml     Fri Jun 22 16:40:37 2012
@@ -34,7 +34,7 @@
     <!-- Version of dependend projects -->
     <amdatu.core.version>0.2.1</amdatu.core.version>
     <amdatu.web.version>0.2.1</amdatu.web.version>
-    <amdatu.auth.version>0.2.2</amdatu.auth.version>
+    <amdatu.auth.version>0.2.3-RC2</amdatu.auth.version>
 
     <!-- Version of cassandra itself -->
     <cassandra.version>0.8.10-5</cassandra.version>

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:40:37 2012
@@ -40,6 +40,8 @@
      * 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";
 
     public Option provision() {
         return org.ops4j.pax.exam.CoreOptions.provision(
@@ -102,12 +104,22 @@
     public void configureDefaults(final TestContext testContext) throws 
Exception {
         configureCassandra(testContext);
         configureHttpService(testContext);
+        configureUserAdmin(testContext);
     }
 
     public void configureCassandra(final TestContext testContext) throws 
Exception {
         testContext.updateConfig(CassandraServerConfigurationService.PID, 
getCassandraServerConfig());
         testContext.updateConfig("org.amdatu.core.cassandra.client", 
getCassandraClientConfig());
         
testContext.updateConfig("org.amdatu.cassandra.persistencemanager.hector", 
getCassandraHectorPMConfig());
+        
testContext.updateConfig("org.amdatu.cassandra.persistencemanager.hector", 
getCassandraHectorPMConfig());
+    }
+
+    public void configureHttpService(final TestContext testContext) throws 
Exception {
+        testContext.updateConfig("org.apache.felix.http", getHttpServiceCfg());
+    }
+
+    private void configureUserAdmin(final TestContext testContext) throws 
Exception {
+        testContext.updateConfig(USERADMIN_PID, getUserAdminCfg());
     }
 
     private Properties getCassandraServerConfig() {
@@ -139,6 +151,15 @@
         return properties;
     }
 
+    private Properties getUserAdminCfg() {
+        Properties properties = new Properties();
+        properties.put("password.minimum_length", "6");
+        properties.put("password.require_mixed_case", "false");
+        properties.put("password.minimum_digits", "0");
+        properties.put("password.minimum_special_characters", "0");
+        return properties;
+    }
+
     private Properties getCassandraHectorPMConfig() {
         Properties properties = new Properties();
         properties.put("rpc_address", "localhost");
@@ -149,10 +170,6 @@
         return properties;
     }
 
-    public void configureHttpService(final TestContext testContext) throws 
Exception {
-        testContext.updateConfig("org.apache.felix.http", getHttpServiceCfg());
-    }
-
     private Properties getHttpServiceCfg() {
         Properties properties = new Properties();
         properties.put("org.osgi.service.http.hostname", HOSTNAME);

Modified: branches/amdatu-cassandra-0.2.5/test-integration/pom.xml
==============================================================================
--- branches/amdatu-cassandra-0.2.5/test-integration/pom.xml    (original)
+++ branches/amdatu-cassandra-0.2.5/test-integration/pom.xml    Fri Jun 22 
16:40:37 2012
@@ -30,7 +30,7 @@
   <properties>
     <org.amdatu.core.version>0.2.1</org.amdatu.core.version>
     <org.amdatu.web.version>0.2.1</org.amdatu.web.version>
-    <org.amdatu.auth.version>0.2.2</org.amdatu.auth.version>
+    <org.amdatu.auth.version>0.2.3-RC2</org.amdatu.auth.version>
   </properties>
 
   <modules>
_______________________________________________
Amdatu-commits mailing list
Amdatu-commits@amdatu.org
http://lists.amdatu.org/mailman/listinfo/amdatu-commits