Author: [email protected]
Date: Tue Nov 1 09:04:06 2011
New Revision: 1693
Log:
[AMDATUCASSANDRA-124] Merged fix from 0.2.1 branch
Modified:
trunk/amdatu-cassandra/cassandra-stores/cassandra-store-useradmin/pom.xml
trunk/amdatu-cassandra/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/osgi/Activator.java
trunk/amdatu-cassandra/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/service/CassandraStorageProviderRegistrationServiceImpl.java
Modified:
trunk/amdatu-cassandra/cassandra-stores/cassandra-store-useradmin/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-stores/cassandra-store-useradmin/pom.xml
(original)
+++ trunk/amdatu-cassandra/cassandra-stores/cassandra-store-useradmin/pom.xml
Tue Nov 1 09:04:06 2011
@@ -39,11 +39,6 @@
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.application</artifactId>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
<type>bundle</type>
</dependency>
@@ -101,7 +96,6 @@
<Bundle-Activator>org.amdatu.cassandra.store.useradmin.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.store.useradmin</Bundle-SymbolicName>
<Import-Package>
- org.amdatu.cassandra.application;version="[1.0,2.0)",
org.amdatu.cassandra.listener;version="[1.0,2.0)",
org.amdatu.cassandra.persistencemanager.hector;version="[1.0,2.0)",
me.prettyprint.hector.api.beans;version="[1.0,2.0)",
Modified:
trunk/amdatu-cassandra/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/osgi/Activator.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/osgi/Activator.java
(original)
+++
trunk/amdatu-cassandra/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/osgi/Activator.java
Tue Nov 1 09:04:06 2011
@@ -15,7 +15,6 @@
*/
package org.amdatu.cassandra.store.useradmin.osgi;
-import org.amdatu.cassandra.application.CassandraDaemonService;
import org.amdatu.cassandra.listener.ColumnFamilyProvider;
import
org.amdatu.cassandra.store.useradmin.service.CassandraStorageProviderRegistrationServiceImpl;
import org.amdatu.cassandra.store.useradmin.service.RoleColumnFamilyProvider;
@@ -42,9 +41,7 @@
// for launching a storage provider for each available tenant
manager.add(createAdapterService(Tenant.class, null)
.setImplementation(CassandraStorageProviderRegistrationServiceImpl.class)
-
.add(createServiceDependency().setService(CassandraDaemonService.class).setRequired(true))
.add(createServiceDependency().setService(LogService.class).setRequired(true)));
-
}
@Override
Modified:
trunk/amdatu-cassandra/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/service/CassandraStorageProviderRegistrationServiceImpl.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/service/CassandraStorageProviderRegistrationServiceImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/service/CassandraStorageProviderRegistrationServiceImpl.java
Tue Nov 1 09:04:06 2011
@@ -17,7 +17,6 @@
import java.util.Hashtable;
-import org.amdatu.cassandra.application.CassandraDaemonService;
import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import
org.amdatu.cassandra.persistencemanager.hector.HectorCassandraPersistenceManager;
@@ -40,17 +39,9 @@
// Service dependencies injected by the depedency manager
private volatile DependencyManager m_dependencyManager;
private volatile Tenant m_tenant;
- private volatile CassandraDaemonService m_daemonService;
private volatile LogService m_logService;
public void start() {
-
- // We will create a storage provider that stores users for this tenant
in a keyspace that equals the
- // tenant id. We therefore first verify if that keyspace exists and if
not, we create it.
- if (!m_daemonService.getKeyspaces().contains(m_tenant.getId())) {
- m_daemonService.addKeyspace(m_tenant.getId());
- }
-
// This filter is used to define a service dependency on the
ColumnFamilyAvailable service
// for the Role ColumnFamily. As a result, our service will depend on
the availability
// of this ColumnFamily.
@@ -73,10 +64,7 @@
.setService(HectorCassandraPersistenceManager.class,
keyspaceFilter).setRequired(true))
.add(
m_dependencyManager.createServiceDependency().setService(ColumnFamilyAvailable.class,
roleFilter)
- .setRequired(true))
- .add(
-
m_dependencyManager.createServiceDependency().setService(CassandraDaemonService.class)
- .setRequired(true)));
+ .setRequired(true)));
m_logService.log(LogService.LOG_INFO,
"Cassandra UserAdmin storage provider started successfully for
tenant '" + m_tenant.getId() + "'");
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
