Author: [email protected]
Date: Tue Jun 14 09:36:17 2011
New Revision: 1170
Log:
[AMDATUCASSANDRA-5] Refactoring useradmin store to be in line with other stores
Added:
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/
- copied from r1169,
/branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/useradminstore/
Removed:
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/useradminstore/
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/core/
Modified:
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/pom.xml
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/osgi/Activator.java
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/service/CassandraStorageProvider.java
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/service/CassandraStorageProviderRegistrationServiceImpl.java
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/service/RoleColumnFamilyProvider.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/tests/pom.xml
Modified: branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/pom.xml
==============================================================================
--- branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/pom.xml
(original)
+++ branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/pom.xml Tue Jun
14 09:36:17 2011
@@ -22,7 +22,7 @@
<artifactId>org.amdatu.cassandra</artifactId>
<version>0.2.0-RC2-SNAPSHOT</version>
</parent>
- <artifactId>org.amdatu.cassandra.useradminstore</artifactId>
+ <artifactId>org.amdatu.cassandra.store.useradmin</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Cassandra - User Admin Cassandra Store</name>
<description>Provides an implementation of the Pax UserAdmin
store</description>
@@ -93,17 +93,17 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.cassandra.useradminstore.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.cassandra.useradminstore</Bundle-SymbolicName>
+
<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;version="[1.0,2.0)",
- org.amdatu.cassandra.useradminstore;version="[1.0,1.1)",
+ org.amdatu.cassandra.store.useradmin;version="[1.0,1.1)",
*
</Import-Package>
<Export-Package>
- org.amdatu.cassandra.useradminstore;version="1.0.0"
+ org.amdatu.cassandra.store.useradmin;version="1.0.0"
</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
Modified:
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/osgi/Activator.java
==============================================================================
---
/branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/useradminstore/osgi/Activator.java
(original)
+++
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/osgi/Activator.java
Tue Jun 14 09:36:17 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.useradminstore.osgi;
+package org.amdatu.cassandra.store.useradmin.osgi;
import org.amdatu.cassandra.application.CassandraDaemonService;
import org.amdatu.cassandra.listener.ColumnFamilyProvider;
Modified:
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/service/CassandraStorageProvider.java
==============================================================================
---
/branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/useradminstore/service/CassandraStorageProvider.java
(original)
+++
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/service/CassandraStorageProvider.java
Tue Jun 14 09:36:17 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.useradminstore.service;
+package org.amdatu.cassandra.store.useradmin.service;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Type;
Modified:
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/service/CassandraStorageProviderRegistrationServiceImpl.java
==============================================================================
---
/branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/useradminstore/service/CassandraStorageProviderRegistrationServiceImpl.java
(original)
+++
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/service/CassandraStorageProviderRegistrationServiceImpl.java
Tue Jun 14 09:36:17 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.useradminstore.service;
+package org.amdatu.cassandra.store.useradmin.service;
import java.util.Hashtable;
@@ -32,7 +32,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 {
Modified:
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/service/RoleColumnFamilyProvider.java
==============================================================================
---
/branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/useradminstore/service/RoleColumnFamilyProvider.java
(original)
+++
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/src/main/java/org/amdatu/cassandra/store/service/RoleColumnFamilyProvider.java
Tue Jun 14 09:36:17 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.useradminstore.service;
+package org.amdatu.cassandra.store.useradmin.service;
import org.amdatu.cassandra.listener.ColumnFamilyDefinition;
import org.amdatu.cassandra.listener.ColumnFamilyDefinition.ColumnType;
@@ -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 {
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:36:17 2011
@@ -146,7 +146,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.useradminstore</artifactId>
+ <artifactId>org.amdatu.cassandra.store.useradmin</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>bundle</type>
@@ -329,7 +329,7 @@
<configuration>
<show>public</show>
<detectOfflineLinks>false</detectOfflineLinks>
-
<excludePackageNames>org.amdatu.cassandra.application.*:org.amdatu.cassandra.gadgetstore.*:org.amdatu.cassandra.listener.*:org.amdatu.cassandra.persistencemanager.*:org.amdatu.cassandra.tenantstore.*:org.amdatu.cassandra.useradminstore.*:org.amdatu.cassandra.test.*,org.amdatu.test.performance.*</excludePackageNames>
+
<excludePackageNames>org.amdatu.cassandra.application.*:org.amdatu.cassandra.gadgetstore.*:org.amdatu.cassandra.listener.*:org.amdatu.cassandra.persistencemanager.*:org.amdatu.cassandra.store.tenant.*:org.amdatu.cassandra.store.useradmin.*:org.amdatu.cassandra.test.*,org.amdatu.test.performance.*</excludePackageNames>
</configuration>
<executions>
<execution>
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:36:17 2011
@@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.useradminstore</artifactId>
+ <artifactId>org.amdatu.cassandra.store.useradmin</artifactId>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
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:36:17 2011
@@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.useradminstore</artifactId>
+ <artifactId>org.amdatu.cassandra.store.useradmin</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>bundle</type>
@@ -112,7 +112,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.useradminstore</artifactId>
+ <artifactId>org.amdatu.cassandra.store.useradmin</artifactId>
<type>bundle</type>
</dependency>
<dependency>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
