Author: [email protected]
Date: Fri Sep 23 12:19:55 2011
New Revision: 1413
Log:
[AMDATUCASSANDRA-91] Patch applied
Modified:
trunk/amdatu-cassandra/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/service/CassandraPersistenceManagerFactoryImpl.java
trunk/amdatu-cassandra/test-integration/tests/src/test/java/org/amdatu/cassandra/test/integration/tests/CassandraDaemonTest.java
Modified:
trunk/amdatu-cassandra/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/service/CassandraPersistenceManagerFactoryImpl.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/service/CassandraPersistenceManagerFactoryImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/service/CassandraPersistenceManagerFactoryImpl.java
Fri Sep 23 12:19:55 2011
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.cassandra.persistencemanager.service;
-
+package org.amdatu.cassandra.persistencemanager.service;
+
import java.util.Dictionary;
import java.util.Hashtable;
@@ -22,35 +22,37 @@
import org.amdatu.cassandra.application.CassandraDaemonService;
import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import
org.amdatu.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
+import
org.amdatu.cassandra.persistencemanager.HectorCassandraPersistenceManager;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
import org.osgi.service.log.LogService;
-
+
/**
- * This factory is responsible for creating Cassandra Persistence Manager
instances.
+ * This factory is responsible for creating Cassandra Persistence Manager
instances.
*
- * @author ivol
- */
-public class CassandraPersistenceManagerFactoryImpl implements
CassandraPersistenceManagerFactory {
+ * @author ivol
+ */
+public class CassandraPersistenceManagerFactoryImpl implements
CassandraPersistenceManagerFactory {
// Instances injected by the Felix dependency manager
- private volatile DependencyManager m_dependencyManager;
- private volatile LogService m_logService;
-
- public void createCassandraPersistenceManager(final String keyspaceId) {
- Dictionary<String, String> serviceProperties = new Hashtable<String,
String>();
- serviceProperties.put(CassandraPersistenceManager.KEYSPACE_AWARE_KEY,
keyspaceId);
-
- Component component = m_dependencyManager.createComponent();
-
component.setImplementation(HectorCassandraPersistenceManagerImpl.class);
- component.setInterface(CassandraPersistenceManager.class.getName(),
serviceProperties);
-
component.add(m_dependencyManager.createServiceDependency().setService(LogService.class).setRequired(true));
-
component.add(m_dependencyManager.createServiceDependency().setService(CassandraConfigurationService.class)
- .setRequired(true));
-
component.add(m_dependencyManager.createServiceDependency().setService(CassandraDaemonService.class)
- .setRequired(true));
-
- m_dependencyManager.add(component);
- m_logService.log(LogService.LOG_INFO, "Cassandra Persistence Manager
service for keyspace '" + keyspaceId
- + "' registered");
- }
-}
+ private volatile DependencyManager m_dependencyManager;
+ private volatile LogService m_logService;
+
+ public void createCassandraPersistenceManager(final String keyspaceId) {
+ Dictionary<String, String> serviceProperties = new Hashtable<String,
String>();
+ serviceProperties.put(CassandraPersistenceManager.KEYSPACE_AWARE_KEY,
keyspaceId);
+
+ Component component = m_dependencyManager.createComponent();
+
component.setImplementation(HectorCassandraPersistenceManagerImpl.class);
+ component.setInterface(new
String[]{CassandraPersistenceManager.class.getName(),
+ HectorCassandraPersistenceManager.class.getName()},
serviceProperties);
+
component.add(m_dependencyManager.createServiceDependency().setService(LogService.class).setRequired(true));
+
component.add(m_dependencyManager.createServiceDependency().setService(CassandraConfigurationService.class)
+ .setRequired(true));
+
component.add(m_dependencyManager.createServiceDependency().setService(CassandraDaemonService.class)
+ .setRequired(true));
+
+ m_dependencyManager.add(component);
+ m_logService.log(LogService.LOG_INFO, "Cassandra Persistence Manager
service for keyspace '" + keyspaceId
+ + "' registered");
+ }
+}
Modified:
trunk/amdatu-cassandra/test-integration/tests/src/test/java/org/amdatu/cassandra/test/integration/tests/CassandraDaemonTest.java
==============================================================================
---
trunk/amdatu-cassandra/test-integration/tests/src/test/java/org/amdatu/cassandra/test/integration/tests/CassandraDaemonTest.java
(original)
+++
trunk/amdatu-cassandra/test-integration/tests/src/test/java/org/amdatu/cassandra/test/integration/tests/CassandraDaemonTest.java
Fri Sep 23 12:19:55 2011
@@ -89,14 +89,15 @@
// Sleep a second, this increases the probability that write requests
have been handled
Thread.sleep(5000);
-
+
+ // We expect that all created column families are available now. Note
that more column families may be
+ // added to the keyspace by other ColumnFamily providers, so we should
not expect that there are
+ // exactly 4 CFs available now.
List<String> allColumnFamilies =
m_daemonService.getColumnFamilies(KEYSPACE);
Assert.assertTrue(allColumnFamilies.contains(COLUMNFAMILY));
Assert.assertTrue(allColumnFamilies.contains(COLUMNFAMILY.toLowerCase()));
Assert.assertTrue(allColumnFamilies.contains(COLUMNFAMILY.toUpperCase()));
- Assert.assertTrue("Expected available ColumnFamily's = 4, but actual =
"
- + allColumnFamilies.size(), allColumnFamilies.size() == 4);
-
+
tearDown();
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
