Author: [email protected]
Date: Mon Sep 19 09:23:28 2011
New Revision: 1390
Log:
[AMDATUCASSANDRA-69] Refactoring artifact to be consistent with other storage
implementations
Added:
trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/store/gadget/
- copied from r1389,
/trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/gadgetstore/
Removed:
trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/gadgetstore/
Modified:
trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/store/gadget/osgi/Activator.java
trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/store/gadget/service/CassandraGadgetStorageProviderImpl.java
trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/store/gadget/service/GadgetColumnFamilyProvider.java
Modified:
trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/store/gadget/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/gadgetstore/osgi/Activator.java
(original)
+++
trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/store/gadget/osgi/Activator.java
Mon Sep 19 09:23:28 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,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.cassandra.gadgetstore.osgi;
+package org.amdatu.cassandra.store.gadget.osgi;
-import
org.amdatu.cassandra.gadgetstore.service.CassandraGadgetStorageProviderImpl;
-import org.amdatu.cassandra.gadgetstore.service.GadgetColumnFamilyProvider;
-import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
-import org.amdatu.cassandra.listener.ColumnFamilyProvider;
-import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
-import org.amdatu.opensocial.gadgetmanagement.GadgetStorageProvider;
-import org.apache.felix.dm.DependencyActivatorBase;
-import org.apache.felix.dm.DependencyManager;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogService;
+import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
+import org.amdatu.cassandra.listener.ColumnFamilyProvider;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
+import
org.amdatu.cassandra.store.gadget.service.CassandraGadgetStorageProviderImpl;
+import org.amdatu.cassandra.store.gadget.service.GadgetColumnFamilyProvider;
+import org.amdatu.opensocial.gadgetmanagement.GadgetStorageProvider;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.log.LogService;
/**
* This is the bundle activator for the Cassandra gadget store bundle.
Modified:
trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/store/gadget/service/CassandraGadgetStorageProviderImpl.java
==============================================================================
---
/trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/gadgetstore/service/CassandraGadgetStorageProviderImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/store/gadget/service/CassandraGadgetStorageProviderImpl.java
Mon Sep 19 09:23:28 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,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.cassandra.gadgetstore.service;
+package org.amdatu.cassandra.store.gadget.service;
-import static
org.amdatu.cassandra.gadgetstore.service.GadgetColumnFamilyProvider.CF_GADGET;
-import static
org.amdatu.cassandra.gadgetstore.service.GadgetColumnFamilyProvider.CF_GADGETCATEGORY;
+import static
org.amdatu.cassandra.store.gadget.service.GadgetColumnFamilyProvider.CF_GADGET;
+import static
org.amdatu.cassandra.store.gadget.service.GadgetColumnFamilyProvider.CF_GADGETCATEGORY;
import java.util.Arrays;
import java.util.Comparator;
@@ -35,7 +35,7 @@
/**
* This class provides a Cassandra implementation of the GadgetStore. The
GadgetStore is responsible for storing
* gadget definitions and categories.
- *
+ *
* @author ivol
*/
public class CassandraGadgetStorageProviderImpl implements
GadgetStorageProvider {
@@ -66,7 +66,7 @@
/**
* Constructor used by the Unit test.
- *
+ *
* @param pm
* The Cassandra persistence manager mock
* @param logService
Modified:
trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/store/gadget/service/GadgetColumnFamilyProvider.java
==============================================================================
---
/trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/gadgetstore/service/GadgetColumnFamilyProvider.java
(original)
+++
trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/store/gadget/service/GadgetColumnFamilyProvider.java
Mon Sep 19 09:23:28 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,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.cassandra.gadgetstore.service;
+package org.amdatu.cassandra.store.gadget.service;
-import org.amdatu.cassandra.listener.ColumnFamilyDefinition;
-import org.amdatu.cassandra.listener.ColumnFamilyDefinition.ColumnType;
-import org.amdatu.cassandra.listener.ColumnFamilyDefinition.CompareType;
-import org.amdatu.cassandra.listener.ColumnFamilyProvider;
-import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.cassandra.listener.ColumnFamilyDefinition;
+import org.amdatu.cassandra.listener.ColumnFamilyDefinition.ColumnType;
+import org.amdatu.cassandra.listener.ColumnFamilyDefinition.CompareType;
+import org.amdatu.cassandra.listener.ColumnFamilyProvider;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
/**
* This service provides the ColumnFamilies 'Gadget' and 'GadgetCategory' for
the Default keyspace.
- *
+ *
* @author ivol
*/
public class GadgetColumnFamilyProvider implements ColumnFamilyProvider {
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
