Author: [email protected]
Date: Tue Jun 14 09:25:18 2011
New Revision: 1166
Log:
[AMDATUCASSANDRA-5] Refactoring tenant store to be in line with other stores
Added:
branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/src/main/java/org/amdatu/cassandra/store/
- copied from r1165,
/branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/src/main/java/org/amdatu/cassandra/tenantstore/
Removed:
branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/src/main/java/org/amdatu/cassandra/tenantstore/
Modified:
branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/pom.xml
branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/src/main/java/org/amdatu/cassandra/store/osgi/Activator.java
branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/src/main/java/org/amdatu/cassandra/store/service/TenantColumnFamilyProvider.java
branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/src/main/java/org/amdatu/cassandra/store/service/TenantStorageProviderCassandraImpl.java
branches/amdatu-cassandra-0.2.0/pom.xml
branches/amdatu-cassandra-0.2.0/release/pom.xml
branches/amdatu-cassandra-0.2.0/test-integration/base/src/main/java/org/amdatu/cassandra/test/integration/base/CassandraFixture.java
branches/amdatu-cassandra-0.2.0/test-integration/tests/pom.xml
Modified: branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/pom.xml
==============================================================================
--- branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/pom.xml
(original)
+++ branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/pom.xml Tue Jun
14 09:25:18 2011
@@ -22,7 +22,7 @@
<artifactId>org.amdatu.cassandra</artifactId>
<version>0.2.0-RC2-SNAPSHOT</version>
</parent>
- <artifactId>org.amdatu.cassandra.tenantstore</artifactId>
+ <artifactId>org.amdatu.cassandra.store.tenant</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Cassandra - Tenant Cassandra Store</name>
<description>Provides an implementation of the Tenant store</description>
@@ -60,8 +60,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.cassandra.tenantstore.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.cassandra.tenantstore</Bundle-SymbolicName>
+
<Bundle-Activator>org.amdatu.cassandra.store.tenant.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.cassandra.store.tenant</Bundle-SymbolicName>
<Import-Package>
org.amdatu.cassandra.application;version="[1.0,2.0)",
org.amdatu.cassandra.listener;version="[1.0,2.0)",
Modified:
branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/src/main/java/org/amdatu/cassandra/store/osgi/Activator.java
==============================================================================
---
/branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/src/main/java/org/amdatu/cassandra/tenantstore/osgi/Activator.java
(original)
+++
branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/src/main/java/org/amdatu/cassandra/store/osgi/Activator.java
Tue Jun 14 09:25:18 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.cassandra.tenantstore.osgi;
+package org.amdatu.cassandra.store.tenant.osgi;
import org.amdatu.cassandra.application.CassandraDaemonService;
import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
Modified:
branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/src/main/java/org/amdatu/cassandra/store/service/TenantColumnFamilyProvider.java
==============================================================================
---
/branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/src/main/java/org/amdatu/cassandra/tenantstore/service/TenantColumnFamilyProvider.java
(original)
+++
branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/src/main/java/org/amdatu/cassandra/store/service/TenantColumnFamilyProvider.java
Tue Jun 14 09:25:18 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.cassandra.tenantstore.service;
+package org.amdatu.cassandra.store.tenant.service;
import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
import org.amdatu.cassandra.listener.ColumnFamilyDefinition;
@@ -24,7 +24,7 @@
/**
* This class provides the ColumnFamily 'Tenant' for the default keyspace.
- *
+ *
* @author ivol
*/
public class TenantColumnFamilyProvider implements ColumnFamilyProvider {
Modified:
branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/src/main/java/org/amdatu/cassandra/store/service/TenantStorageProviderCassandraImpl.java
==============================================================================
---
/branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/src/main/java/org/amdatu/cassandra/tenantstore/service/TenantStorageProviderCassandraImpl.java
(original)
+++
branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/src/main/java/org/amdatu/cassandra/store/service/TenantStorageProviderCassandraImpl.java
Tue Jun 14 09:25:18 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.cassandra.tenantstore.service;
+package org.amdatu.cassandra.store.tenant.service;
-import static
org.amdatu.cassandra.tenantstore.service.TenantColumnFamilyProvider.CF_TENANT;
+import static
org.amdatu.cassandra.store.tenant.service.TenantColumnFamilyProvider.CF_TENANT;
import java.util.ArrayList;
import java.util.HashMap;
Modified: branches/amdatu-cassandra-0.2.0/pom.xml
==============================================================================
--- branches/amdatu-cassandra-0.2.0/pom.xml (original)
+++ branches/amdatu-cassandra-0.2.0/pom.xml Tue Jun 14 09:25:18 2011
@@ -139,7 +139,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.tenantstore</artifactId>
+ <artifactId>org.amdatu.cassandra.store.tenant</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>bundle</type>
Modified: branches/amdatu-cassandra-0.2.0/release/pom.xml
==============================================================================
--- branches/amdatu-cassandra-0.2.0/release/pom.xml (original)
+++ branches/amdatu-cassandra-0.2.0/release/pom.xml Tue Jun 14 09:25:18 2011
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.tenantstore</artifactId>
+ <artifactId>org.amdatu.cassandra.store.tenant</artifactId>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
Modified:
branches/amdatu-cassandra-0.2.0/test-integration/base/src/main/java/org/amdatu/cassandra/test/integration/base/CassandraFixture.java
==============================================================================
---
branches/amdatu-cassandra-0.2.0/test-integration/base/src/main/java/org/amdatu/cassandra/test/integration/base/CassandraFixture.java
(original)
+++
branches/amdatu-cassandra-0.2.0/test-integration/base/src/main/java/org/amdatu/cassandra/test/integration/base/CassandraFixture.java
Tue Jun 14 09:25:18 2011
@@ -36,7 +36,7 @@
mavenBundle().groupId("org.amdatu.cassandra").artifactId("org.amdatu.cassandra.listener").versionAsInProject(),
mavenBundle().groupId("org.amdatu.cassandra").artifactId("org.amdatu.cassandra.persistencemanager").versionAsInProject(),
mavenBundle().groupId("org.amdatu.cassandra").artifactId("org.amdatu.cassandra.useradminstore").versionAsInProject(),
-
mavenBundle().groupId("org.amdatu.cassandra").artifactId("org.amdatu.cassandra.tenantstore").versionAsInProject()
+
mavenBundle().groupId("org.amdatu.cassandra").artifactId("org.amdatu.cassandra.store.tenant").versionAsInProject()
);
}
Modified: branches/amdatu-cassandra-0.2.0/test-integration/tests/pom.xml
==============================================================================
--- branches/amdatu-cassandra-0.2.0/test-integration/tests/pom.xml
(original)
+++ branches/amdatu-cassandra-0.2.0/test-integration/tests/pom.xml Tue Jun
14 09:25:18 2011
@@ -78,7 +78,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.tenantstore</artifactId>
+ <artifactId>org.amdatu.cassandra.store.tenant</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>bundle</type>
@@ -117,7 +117,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.tenantstore</artifactId>
+ <artifactId>org.amdatu.cassandra.store.tenant</artifactId>
<type>bundle</type>
</dependency>
</dependencies>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
