Author: [email protected]
Date: Tue Mar 13 16:57:33 2012
New Revision: 2143
Log:
Modified:
branches/cassandra-platform-0.3.0/cassandra-listener/pom.xml
branches/cassandra-platform-0.3.0/cassandra-stores/cassandra-store-useradmin/pom.xml
branches/cassandra-platform-0.3.0/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/osgi/Activator.java
branches/cassandra-platform-0.3.0/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/service/CassandraStorageProviderRegistrationServiceImpl.java
branches/cassandra-platform-0.3.0/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/service/RoleColumnFamilyProvider.java
branches/cassandra-platform-0.3.0/pom.xml
Modified: branches/cassandra-platform-0.3.0/cassandra-listener/pom.xml
==============================================================================
--- branches/cassandra-platform-0.3.0/cassandra-listener/pom.xml
(original)
+++ branches/cassandra-platform-0.3.0/cassandra-listener/pom.xml Tue Mar
13 16:57:33 2012
@@ -64,7 +64,7 @@
<X-MultiTenant-Version>1</X-MultiTenant-Version>
<X-MultiTenant-Bundle-Activator>org.amdatu.cassandra.listener.osgi.Activator</X-MultiTenant-Bundle-Activator>
<X-MultiTenant-Binding>PLATFORM</X-MultiTenant-Binding>
-
<X-MultiTenant-Scope>(|(org.amdatu.tenant.pid=%TENANTPID%)(objectClass=org.osgi.service.log.LogService))</X-MultiTenant-Scope>
+
<X-MultiTenant-Scope>(|(org.amdatu.tenant.pid=%TENANTPID%)(objectClass=org.osgi.service.log.LogService)(objectClass=org.amdatu.cassandra.listener.ColumnFamilyProvider))</X-MultiTenant-Scope>
<Bundle-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.listener</Bundle-SymbolicName>
<Import-Package>
Modified:
branches/cassandra-platform-0.3.0/cassandra-stores/cassandra-store-useradmin/pom.xml
==============================================================================
---
branches/cassandra-platform-0.3.0/cassandra-stores/cassandra-store-useradmin/pom.xml
(original)
+++
branches/cassandra-platform-0.3.0/cassandra-stores/cassandra-store-useradmin/pom.xml
Tue Mar 13 16:57:33 2012
@@ -33,8 +33,8 @@
<dependencies>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenant</artifactId>
+ <groupId>org.amdatu.tenant</groupId>
+ <artifactId>org.amdatu.tenant</artifactId>
<type>bundle</type>
</dependency>
<dependency>
@@ -77,7 +77,11 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.cassandra.store.useradmin.osgi.Activator</Bundle-Activator>
+ <X-MultiTenant-Version>1</X-MultiTenant-Version>
+
<X-MultiTenant-Bundle-Activator>org.amdatu.cassandra.store.useradmin.osgi.Activator</X-MultiTenant-Bundle-Activator>
+ <X-MultiTenant-Binding>TENANTS</X-MultiTenant-Binding>
+
<X-MultiTenant-Scope>(|(org.amdatu.tenant.pid=%TENANTPID%)(objectClass=org.osgi.service.log.LogService)(objectClass=org.amdatu.cassandra.persistencemanager.hector.HectorCassandraPersistenceManager)(objectClass=org.amdatu.cassandra.listener.ColumnFamilyAvailable))</X-MultiTenant-Scope>
+
<Bundle-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.store.useradmin</Bundle-SymbolicName>
<Import-Package>
org.amdatu.cassandra.listener;version="[1.0,2.0)",
Modified:
branches/cassandra-platform-0.3.0/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/osgi/Activator.java
==============================================================================
---
branches/cassandra-platform-0.3.0/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/osgi/Activator.java
(original)
+++
branches/cassandra-platform-0.3.0/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/osgi/Activator.java
Tue Mar 13 16:57:33 2012
@@ -18,7 +18,7 @@
import org.amdatu.cassandra.listener.ColumnFamilyProvider;
import
org.amdatu.cassandra.store.useradmin.service.CassandraStorageProviderRegistrationServiceImpl;
import org.amdatu.cassandra.store.useradmin.service.RoleColumnFamilyProvider;
-import org.amdatu.core.tenant.Tenant;
+import org.amdatu.tenant.Tenant;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
Modified:
branches/cassandra-platform-0.3.0/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/service/CassandraStorageProviderRegistrationServiceImpl.java
==============================================================================
---
branches/cassandra-platform-0.3.0/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/service/CassandraStorageProviderRegistrationServiceImpl.java
(original)
+++
branches/cassandra-platform-0.3.0/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/service/CassandraStorageProviderRegistrationServiceImpl.java
Tue Mar 13 16:57:33 2012
@@ -18,7 +18,7 @@
import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import
org.amdatu.cassandra.persistencemanager.hector.HectorCassandraPersistenceManager;
-import org.amdatu.core.tenant.Tenant;
+import org.amdatu.tenant.Tenant;
import java.util.Hashtable;
@@ -33,7 +33,7 @@
* StorageProvider for each available tenant (it is an adaptor of tenant
itself) but more importantly, it defines
* the proper service dependencies; availability of the Role ColumnFamily in
the keyspace associated with the tenant
* and the Cassandra Persistence Manager for the keyspace associated with the
tenant.
- *
+ *
* @author ivol
*/
public class CassandraStorageProviderRegistrationServiceImpl {
@@ -47,14 +47,14 @@
// for the Role ColumnFamily. As a result, our service will depend on
the availability
// of this ColumnFamily.
String roleFilter = "(" + ColumnFamilyAvailable.FILTER_NAME + "=" +
CassandraStorageProvider.CF_ROLE + ")";
- String keyspaceFilter = "(" +
CassandraPersistenceManager.KEYSPACE_AWARE_KEY + "=" + m_tenant.getId() + ")";
+ String keyspaceFilter = "(" +
CassandraPersistenceManager.KEYSPACE_AWARE_KEY + "=" + m_tenant.getPID() + ")";
roleFilter = "(&" + roleFilter + keyspaceFilter + ")";
// Create and register the CassandraStorageProvider service.
Hashtable<String, Object> properties = new Hashtable<String, Object>();
- properties.put(UserAdminConstants.STORAGEPROVIDER_TYPE, "Cassandra_" +
m_tenant.getId());
+ properties.put(UserAdminConstants.STORAGEPROVIDER_TYPE, "Cassandra_" +
m_tenant.getPID());
properties.put(Constants.SERVICE_RANKING, 10);
- properties.put(Tenant.TENANT_ID_SERVICEPROPERTY, m_tenant.getId());
+ properties.put(org.amdatu.tenant.Constants.PID_KEY, m_tenant.getPID());
m_dependencyManager.add(m_dependencyManager
.createComponent()
.setInterface(new String[] {StorageProvider.class.getName()},
properties)
@@ -68,6 +68,6 @@
.setRequired(true)));
m_logService.log(LogService.LOG_INFO,
- "Cassandra UserAdmin storage provider started successfully for
tenant '" + m_tenant.getId() + "'");
+ "Cassandra UserAdmin storage provider started successfully for
tenant '" + m_tenant.getPID() + "'");
}
}
Modified:
branches/cassandra-platform-0.3.0/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/service/RoleColumnFamilyProvider.java
==============================================================================
---
branches/cassandra-platform-0.3.0/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/service/RoleColumnFamilyProvider.java
(original)
+++
branches/cassandra-platform-0.3.0/cassandra-stores/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/useradmin/service/RoleColumnFamilyProvider.java
Tue Mar 13 16:57:33 2012
@@ -19,7 +19,7 @@
import org.amdatu.cassandra.listener.ColumnFamilyDefinition.ColumnType;
import org.amdatu.cassandra.listener.ColumnFamilyDefinition.CompareType;
import org.amdatu.cassandra.listener.ColumnFamilyProvider;
-import org.amdatu.core.tenant.Tenant;
+import org.amdatu.tenant.Tenant;
/**
* This service only provides the Role Column Family. Note that the
CassandraStorageProvider has
@@ -31,7 +31,7 @@
* The storage provider will be tenant aware; users in UserAdmin are stored
for each tenant. Therefore
* this CF provider is an adapter service for Tenant; for each tenant an
instance of this service will
* be created and that instance will register the Role CF for a keyspace that
matches the tenant id.
- *
+ *
* @author ivol
*/
public class RoleColumnFamilyProvider implements ColumnFamilyProvider {
@@ -42,7 +42,7 @@
public ColumnFamilyDefinition[] getColumnFamilies() {
return new ColumnFamilyDefinition[] {new ColumnFamilyDefinition(
CassandraStorageProvider.CF_ROLE,
- new String[] {m_tenant.getId()}, // Associate the keyspace of this
CF with the tenant
+ new String[] {m_tenant.getPID()}, // Associate the keyspace of
this CF with the tenant
ColumnType.SUPER,
CompareType.BYTESTYPE,
CompareType.BYTESTYPE) };
Modified: branches/cassandra-platform-0.3.0/pom.xml
==============================================================================
--- branches/cassandra-platform-0.3.0/pom.xml (original)
+++ branches/cassandra-platform-0.3.0/pom.xml Tue Mar 13 16:57:33 2012
@@ -184,8 +184,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenant</artifactId>
+ <groupId>org.amdatu.tenant</groupId>
+ <artifactId>org.amdatu.tenant</artifactId>
<version>${amdatu.core.version}</version>
<scope>provided</scope>
<type>bundle</type>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
