Author: [email protected]
Date: Fri May 11 17:11:26 2012
New Revision: 2346
Log:
[AMDATUCASSANDRA-183] Applied multi tenant and provisioning fixes, added amdatu
maven plugin configuration
Modified:
trunk/amdatu-cassandra/cassandra-client/src/main/java/org/amdatu/cassandra/client/service/TenantKeyspaceMapperImpl.java
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
trunk/amdatu-cassandra/cassandra-stores/pom.xml
trunk/amdatu-cassandra/config/src/main/resources/amdatu.cassandra.application.config.xml
trunk/amdatu-cassandra/config/src/main/resources/amdatu.cassandra.client.config.xml
trunk/amdatu-cassandra/config/src/main/resources/amdatu.cassandra.persistencemanager.hector.config.xml
trunk/amdatu-cassandra/pom.xml
Modified:
trunk/amdatu-cassandra/cassandra-client/src/main/java/org/amdatu/cassandra/client/service/TenantKeyspaceMapperImpl.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-client/src/main/java/org/amdatu/cassandra/client/service/TenantKeyspaceMapperImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-client/src/main/java/org/amdatu/cassandra/client/service/TenantKeyspaceMapperImpl.java
Fri May 11 17:11:26 2012
@@ -37,7 +37,7 @@
tenantPid = DEFAULT_KEYSPACE;
}
else {
- tenantPid = tenantPid.replace(".", "_");
+ tenantPid = normalizeKeyspaceName(tenantPid);
}
return tenantPid;
}
@@ -53,7 +53,7 @@
}
}
else {
- if (keyspace.equals(tenant.getPID().replace(".", "_"))) {
+ if
(keyspace.equals(normalizeKeyspaceName(tenant.getPID()))) {
return tenant;
}
}
@@ -70,4 +70,11 @@
String keyspace = tenantToKeyspace(tenant);
return "(" + KEYSPACE_AWARE_KEY + "=" + keyspace + ")";
}
+
+ private String normalizeKeyspaceName(String ksName) {
+ String name = ksName;
+ name = name.replace(".", "_");
+ name = name.replace("-", "_");
+ return name;
+ }
}
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
Fri May 11 17:11:26 2012
@@ -44,7 +44,8 @@
// for launching a storage provider for each available tenant
manager.add(createAdapterService(Tenant.class, null)
.setImplementation(CassandraStorageProviderRegistrationServiceImpl.class)
-
.add(createServiceDependency().setService(LogService.class).setRequired(true)));
+
.add(createServiceDependency().setService(LogService.class).setRequired(true))
+
.add(createServiceDependency().setService(TenantKeyspaceMapper.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
Fri May 11 17:11:26 2012
@@ -41,13 +41,14 @@
private volatile DependencyManager m_dependencyManager;
private volatile Tenant m_tenant;
private volatile LogService m_logService;
+ private volatile TenantKeyspaceMapper m_tksMapper;
public void start() {
// 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.
String roleFilter = "(" + ColumnFamilyAvailable.FILTER_NAME + "=" +
CassandraStorageProvider.CF_ROLE + ")";
- String keyspaceFilter = "(" + TenantKeyspaceMapper.KEYSPACE_AWARE_KEY
+ "=" + m_tenant.getPID() + ")";
+ String keyspaceFilter =
m_tksMapper.getKeyspaceAwareServiceFilter(m_tenant);
roleFilter = "(&" + roleFilter + keyspaceFilter + ")";
// Create and register the CassandraStorageProvider service.
Modified: trunk/amdatu-cassandra/cassandra-stores/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-stores/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-stores/pom.xml Fri May 11 17:11:26 2012
@@ -93,6 +93,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ </plugin>
</plugins>
</build>
</profile>
Modified:
trunk/amdatu-cassandra/config/src/main/resources/amdatu.cassandra.application.config.xml
==============================================================================
---
trunk/amdatu-cassandra/config/src/main/resources/amdatu.cassandra.application.config.xml
(original)
+++
trunk/amdatu-cassandra/config/src/main/resources/amdatu.cassandra.application.config.xml
Fri May 11 17:11:26 2012
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(|(!(org.amdatu.tenant.pid=*))(org.amdatu.tenant.pid=org.amdatu.tenant.PLATFORM))">
+<MetaData xmlns="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(|(!(org.amdatu.tenant.pid=*))(org.amdatu.tenant.pid=org.amdatu.tenant.PLATFORM))">
<OCD name="Apache Cassandra Application"
id="org.amdatu.core.cassandra.application">
<AD id="workdir" type="STRING" cardinality="0" />
<AD id="commitlogdir" type="STRING" cardinality="0" />
Modified:
trunk/amdatu-cassandra/config/src/main/resources/amdatu.cassandra.client.config.xml
==============================================================================
---
trunk/amdatu-cassandra/config/src/main/resources/amdatu.cassandra.client.config.xml
(original)
+++
trunk/amdatu-cassandra/config/src/main/resources/amdatu.cassandra.client.config.xml
Fri May 11 17:11:26 2012
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(|(!(org.amdatu.tenant.pid=*))(org.amdatu.tenant.pid=org.amdatu.tenant.PLATFORM))">
+<MetaData xmlns="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(|(!(org.amdatu.tenant.pid=*))(org.amdatu.tenant.pid=org.amdatu.tenant.PLATFORM))">
<OCD name="Apache Cassandra Client" id="org.amdatu.core.cassandra.client">
<AD id="clustername" type="STRING" cardinality="0" />
<AD id="schema_agreement_timeout" type="STRING" cardinality="0" />
Modified:
trunk/amdatu-cassandra/config/src/main/resources/amdatu.cassandra.persistencemanager.hector.config.xml
==============================================================================
---
trunk/amdatu-cassandra/config/src/main/resources/amdatu.cassandra.persistencemanager.hector.config.xml
(original)
+++
trunk/amdatu-cassandra/config/src/main/resources/amdatu.cassandra.persistencemanager.hector.config.xml
Fri May 11 17:11:26 2012
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(|(!(org.amdatu.tenant.pid=*))(org.amdatu.tenant.pid=org.amdatu.tenant.PLATFORM))">
+<MetaData xmlns="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(|(!(org.amdatu.tenant.pid=*))(org.amdatu.tenant.pid=org.amdatu.tenant.PLATFORM))">
<OCD name="Apache Cassandra Client"
id="org.amdatu.cassandra.persistencemanager.hector">
<AD id="clustername" type="STRING" cardinality="0" />
<AD id="consistency_level_read" type="STRING" cardinality="0" />
Modified: trunk/amdatu-cassandra/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/pom.xml (original)
+++ trunk/amdatu-cassandra/pom.xml Fri May 11 17:11:26 2012
@@ -401,6 +401,23 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ <configuration>
+ <clientEndpoint>http://localhost:8080/client/work</clientEndpoint>
+ <obrEndpoint>http://localhost:8080/obr</obrEndpoint>
+ </configuration>
+ <executions>
+ <execution>
+ <id>uploadToAmdatu</id>
+ <phase>package</phase>
+ <goals>
+ <goal>deployArtifact</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
