Author: bdekruijff at gmail.com
Date: Wed Nov 24 17:01:06 2010
New Revision: 440
Log:
AMDATU-191 Refactored packagenames annd introduced amdatu-cassandra subproject
parent module
Added:
trunk/amdatu-cassandra/ (props changed)
trunk/amdatu-cassandra/pom.xml
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/CassandraConfigurationService.java
- copied, changed from r439,
/trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/CassandraConfigurationService.java
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/CassandraDaemonService.java
- copied, changed from r439,
/trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/CassandraDaemonService.java
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/osgi/
- copied from r439,
/trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/osgi/
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/
- copied from r439,
/trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/service/
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/ColumnFamilyAvailable.java
- copied, changed from r439,
/trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/ColumnFamilyAvailable.java
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/ColumnFamilyDefinition.java
- copied, changed from r439,
/trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/ColumnFamilyDefinition.java
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/ColumnFamilyProvider.java
- copied, changed from r439,
/trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/ColumnFamilyProvider.java
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/osgi/
- copied from r439,
/trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/osgi/
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/
- copied from r439,
/trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/service/
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/CassandraException.java
- copied, changed from r439,
/trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/CassandraException.java
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/CassandraPersistenceManager.java
- copied, changed from r439,
/trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/CassandraPersistenceManager.java
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/CassandraPersistenceManagerFactory.java
- copied, changed from r439,
/trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/CassandraPersistenceManagerFactory.java
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/osgi/
- copied from r439,
/trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/osgi/
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/service/
- copied from r439,
/trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/service/
trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/
trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/tenantstore/
trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/tenantstore/osgi/
- copied from r439,
/trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/core/cassandra/tenantstore/osgi/
trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/tenantstore/service/
- copied from r439,
/trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/core/cassandra/tenantstore/service/
trunk/amdatu-core/cassandra-tenantstore/src/test/java/org/amdatu/cassandra/
trunk/amdatu-core/cassandra-tenantstore/src/test/java/org/amdatu/cassandra/tenantstore/
trunk/amdatu-core/cassandra-tenantstore/src/test/java/org/amdatu/cassandra/tenantstore/service/
- copied from r439,
/trunk/amdatu-core/cassandra-tenantstore/src/test/java/org/amdatu/core/cassandra/tenantstore/service/
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/DummyResourceInterface.java
- copied, changed from r439,
/trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/DummyResourceInterface.java
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/osgi/
- copied from r439,
/trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/osgi/
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/rest/
- copied from r439,
/trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/rest/
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/service/
- copied from r439,
/trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/service/
Removed:
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/CassandraConfigurationService.java
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/CassandraDaemonService.java
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/osgi/
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/service/
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/ColumnFamilyAvailable.java
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/ColumnFamilyDefinition.java
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/ColumnFamilyProvider.java
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/osgi/
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/service/
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/CassandraException.java
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/CassandraPersistenceManager.java
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/CassandraPersistenceManagerFactory.java
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/osgi/
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/service/
trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/core/cassandra/tenantstore/osgi/
trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/core/cassandra/tenantstore/service/
trunk/amdatu-core/cassandra-tenantstore/src/test/java/org/amdatu/core/cassandra/tenantstore/service/
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/DummyResourceInterface.java
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/osgi/
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/rest/
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/service/
Modified:
trunk/amdatu-core/cassandra-application/pom.xml
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/osgi/Activator.java
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraConfigurationServiceImpl.java
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
trunk/amdatu-core/cassandra-listener/pom.xml
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/osgi/Activator.java
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/CassandraDaemonServiceListener.java
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/ColumnFamilyAvailableImpl.java
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/ColumnFamilyProviderListener.java
trunk/amdatu-core/cassandra-persistencemanager/pom.xml
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/osgi/Activator.java
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/service/CassandraPersistenceManagerFactoryImpl.java
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/service/CassandraPersistenceManagerImpl.java
trunk/amdatu-core/cassandra-tenantstore/pom.xml
trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/tenantstore/osgi/Activator.java
trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/tenantstore/service/TenantColumnFamilyProvider.java
trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/tenantstore/service/TenantStorageProviderCassandraImpl.java
trunk/amdatu-core/cassandra-tenantstore/src/test/java/org/amdatu/cassandra/tenantstore/service/TenantColumnFamilyProviderTest.java
trunk/amdatu-core/cassandra-tenantstore/src/test/java/org/amdatu/cassandra/tenantstore/service/TenantStorageProviderCassandraImplTest.java
trunk/amdatu-core/cassandra-useradminstore/pom.xml
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/osgi/Activator.java
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/rest/GroupsResource.java
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/rest/HttpContextRegistrationServiceImpl.java
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/rest/ResourceBase.java
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/rest/UsersResource.java
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/service/CassandraStorageProvider.java
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/service/RoleColumnFamilyProvider.java
trunk/amdatu-core/pom.xml
trunk/amdatu-core/tenant/pom.xml
trunk/amdatu-example/course-service/pom.xml
trunk/amdatu-opensocial/gadgetmanagement/pom.xml
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
trunk/amdatu-opensocial/pom.xml
trunk/amdatu-opensocial/profile/pom.xml
trunk/amdatu-opensocial/profile/src/main/java/org/amdatu/opensocial/profile/osgi/Activator.java
trunk/amdatu-opensocial/profile/src/main/java/org/amdatu/opensocial/profile/service/FriendColumnFamilyProvider.java
trunk/amdatu-opensocial/shindig/pom.xml
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetColumnFamilyProvider.java
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetStoreImpl.java
trunk/amdatu-release/pom.xml
trunk/amdatu-release/src/main/assembly/bin-component.xml
trunk/integration-tests/pom.xml
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraDaemonIntegrationTest.java
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraPersistenceManagerTest.java
trunk/pom.xml
trunk/src/main/resources/conf/felix-config.properties
Added: trunk/amdatu-cassandra/pom.xml
==============================================================================
--- (empty file)
+++ trunk/amdatu-cassandra/pom.xml Wed Nov 24 17:01:06 2010
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.amdatu</groupId>
+ <artifactId>amdatu</artifactId>
+ <version>0.0.6-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.amdatu.cassandra</artifactId>
+ <packaging>pom</packaging>
+ <name>Amdatu Cassandra</name>
+ <description>This project brings Apache Cassandra persistence services to
the Amdatu platform</description>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>application</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>listener</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>persistencemanager</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>templates</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>httpcontext</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <modules>
+ <module>../amdatu-core/cassandra-application</module>
+ <module>../amdatu-core/cassandra-listener</module>
+ <module>../amdatu-core/cassandra-persistencemanager</module>
+ <module>../amdatu-core/cassandra-tenantstore</module>
+ <module>../amdatu-core/cassandra-useradminstore</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!--
+ Apache Cassandra requires Java 1.6
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
\ No newline at end of file
Modified: trunk/amdatu-core/cassandra-application/pom.xml
==============================================================================
--- trunk/amdatu-core/cassandra-application/pom.xml (original)
+++ trunk/amdatu-core/cassandra-application/pom.xml Wed Nov 24 17:01:06 2010
@@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.core</artifactId>
+ <artifactId>org.amdatu.cassandra</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>application</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Core - Apache Cassandra Application</name>
+ <name>Amdatu Cassandra - Apache Cassandra Application</name>
<description>This bundle embeds the Apache Cassandra libraries and exports
the Cassandra Daemon as an OSGi service</description>
<properties>
@@ -63,8 +63,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.core.cassandra.application.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.core.cassandra.application</Bundle-SymbolicName>
+
<Bundle-Activator>org.amdatu.cassandra.application.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.cassandra.application</Bundle-SymbolicName>
<Include-Resource>
{maven-resources},
lib=src/main/resources/lib,
@@ -100,20 +100,12 @@
<_exportcontents>
org.apache.cassandra.*,
org.apache.thrift.*,
- org.amdatu.core.cassandra.application.*
+ org.amdatu.cassandra.application.*
</_exportcontents>
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
</plugins>
</build>
Copied:
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/CassandraConfigurationService.java
(from r439,
/trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/CassandraConfigurationService.java)
==============================================================================
---
/trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/CassandraConfigurationService.java
(original)
+++
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/CassandraConfigurationService.java
Wed Nov 24 17:01:06 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.application;
+package org.amdatu.cassandra.application;
/**
* Interface for the Cassandra Configuration Service.
Copied:
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/CassandraDaemonService.java
(from r439,
/trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/CassandraDaemonService.java)
==============================================================================
---
/trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/CassandraDaemonService.java
(original)
+++
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/CassandraDaemonService.java
Wed Nov 24 17:01:06 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.application;
+package org.amdatu.cassandra.application;
import java.util.List;
Modified:
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/osgi/Activator.java
(original)
+++
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/osgi/Activator.java
Wed Nov 24 17:01:06 2010
@@ -14,12 +14,12 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.application.osgi;
+package org.amdatu.cassandra.application.osgi;
-import org.amdatu.core.cassandra.application.CassandraConfigurationService;
-import org.amdatu.core.cassandra.application.CassandraDaemonService;
-import
org.amdatu.core.cassandra.application.service.CassandraConfigurationServiceImpl;
-import
org.amdatu.core.cassandra.application.service.CassandraDaemonServiceImpl;
+import org.amdatu.cassandra.application.CassandraConfigurationService;
+import org.amdatu.cassandra.application.CassandraDaemonService;
+import
org.amdatu.cassandra.application.service.CassandraConfigurationServiceImpl;
+import org.amdatu.cassandra.application.service.CassandraDaemonServiceImpl;
import org.amdatu.core.config.templates.ConfigTemplateManager;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
Modified:
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraConfigurationServiceImpl.java
==============================================================================
---
/trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/service/CassandraConfigurationServiceImpl.java
(original)
+++
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraConfigurationServiceImpl.java
Wed Nov 24 17:01:06 2010
@@ -14,14 +14,14 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.application.service;
+package org.amdatu.cassandra.application.service;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.Dictionary;
-import org.amdatu.core.cassandra.application.CassandraConfigurationService;
+import org.amdatu.cassandra.application.CassandraConfigurationService;
import org.amdatu.core.config.templates.ConfigTemplateManager;
import org.apache.log4j.PropertyConfigurator;
import org.osgi.framework.Bundle;
Modified:
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
==============================================================================
---
/trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/service/CassandraDaemonServiceImpl.java
(original)
+++
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
Wed Nov 24 17:01:06 2010
@@ -14,12 +14,12 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.application.service;
+package org.amdatu.cassandra.application.service;
import java.util.ArrayList;
import java.util.List;
-import org.amdatu.core.cassandra.application.CassandraDaemonService;
+import org.amdatu.cassandra.application.CassandraDaemonService;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.avro.CassandraDaemon;
import org.apache.cassandra.thrift.CassandraServer;
Modified: trunk/amdatu-core/cassandra-listener/pom.xml
==============================================================================
--- trunk/amdatu-core/cassandra-listener/pom.xml (original)
+++ trunk/amdatu-core/cassandra-listener/pom.xml Wed Nov 24 17:01:06 2010
@@ -4,23 +4,23 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.core</artifactId>
+ <artifactId>org.amdatu.cassandra</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>listener</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Core - Apache Cassandra Listener</name>
+ <name>Amdatu Cassandra - Apache Cassandra Listener</name>
<description>The Cassandra listener uses the whiteboard pattern to listen to
services that register ColumnFamily's and keyspaces.</description>
<dependencies>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>application</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>persistencemanager</artifactId>
<scope>provided</scope>
<type>bundle</type>
@@ -34,8 +34,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.core.cassandra.listener.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.core.cassandra.listener</Bundle-SymbolicName>
+
<Bundle-Activator>org.amdatu.cassandra.listener.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.cassandra.listener</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
Copied:
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/ColumnFamilyAvailable.java
(from r439,
/trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/ColumnFamilyAvailable.java)
==============================================================================
---
/trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/ColumnFamilyAvailable.java
(original)
+++
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/ColumnFamilyAvailable.java
Wed Nov 24 17:01:06 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.listener;
+package org.amdatu.cassandra.listener;
/**
* In some cases a service depends on the availability of a certain
ColumnFamily.
Copied:
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/ColumnFamilyDefinition.java
(from r439,
/trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/ColumnFamilyDefinition.java)
==============================================================================
---
/trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/ColumnFamilyDefinition.java
(original)
+++
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/ColumnFamilyDefinition.java
Wed Nov 24 17:01:06 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.listener;
+package org.amdatu.cassandra.listener;
/**
* This class holds the definition of a ColumnFamily to be used by the
ColumnFamilyProvider.
Copied:
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/ColumnFamilyProvider.java
(from r439,
/trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/ColumnFamilyProvider.java)
==============================================================================
---
/trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/ColumnFamilyProvider.java
(original)
+++
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/ColumnFamilyProvider.java
Wed Nov 24 17:01:06 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.listener;
+package org.amdatu.cassandra.listener;
/**
* This interface represents a service that provides one or more ColumnFamily's
Modified:
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/osgi/Activator.java
(original)
+++
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/osgi/Activator.java
Wed Nov 24 17:01:06 2010
@@ -14,13 +14,13 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.listener.osgi;
+package org.amdatu.cassandra.listener.osgi;
-import org.amdatu.core.cassandra.application.CassandraDaemonService;
-import org.amdatu.core.cassandra.listener.ColumnFamilyProvider;
-import
org.amdatu.core.cassandra.listener.service.CassandraDaemonServiceListener;
-import org.amdatu.core.cassandra.listener.service.ColumnFamilyProviderListener;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
+import org.amdatu.cassandra.application.CassandraDaemonService;
+import org.amdatu.cassandra.listener.ColumnFamilyProvider;
+import org.amdatu.cassandra.listener.service.CassandraDaemonServiceListener;
+import org.amdatu.cassandra.listener.service.ColumnFamilyProviderListener;
+import
org.amdatu.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/CassandraDaemonServiceListener.java
==============================================================================
---
/trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/service/CassandraDaemonServiceListener.java
(original)
+++
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/CassandraDaemonServiceListener.java
Wed Nov 24 17:01:06 2010
@@ -14,16 +14,16 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.listener.service;
+package org.amdatu.cassandra.listener.service;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.List;
-import org.amdatu.core.cassandra.application.CassandraDaemonService;
-import org.amdatu.core.cassandra.listener.ColumnFamilyAvailable;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
+import org.amdatu.cassandra.application.CassandraDaemonService;
+import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
+import
org.amdatu.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
import org.apache.cassandra.thrift.CfDef;
import org.apache.cassandra.thrift.InvalidRequestException;
import org.apache.cassandra.thrift.KsDef;
Modified:
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/ColumnFamilyAvailableImpl.java
==============================================================================
---
/trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/service/ColumnFamilyAvailableImpl.java
(original)
+++
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/ColumnFamilyAvailableImpl.java
Wed Nov 24 17:01:06 2010
@@ -14,9 +14,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.listener.service;
+package org.amdatu.cassandra.listener.service;
-import org.amdatu.core.cassandra.listener.ColumnFamilyAvailable;
+import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
/**
* Service implementation of the ColumnFamilyAvailable. The implementation is
Modified:
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/ColumnFamilyProviderListener.java
==============================================================================
---
/trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/service/ColumnFamilyProviderListener.java
(original)
+++
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/ColumnFamilyProviderListener.java
Wed Nov 24 17:01:06 2010
@@ -14,14 +14,14 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.listener.service;
+package org.amdatu.cassandra.listener.service;
import java.util.List;
-import org.amdatu.core.cassandra.application.CassandraDaemonService;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition;
-import org.amdatu.core.cassandra.listener.ColumnFamilyProvider;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
+import org.amdatu.cassandra.application.CassandraDaemonService;
+import org.amdatu.cassandra.listener.ColumnFamilyDefinition;
+import org.amdatu.cassandra.listener.ColumnFamilyProvider;
+import
org.amdatu.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.thrift.CassandraServer;
import org.apache.cassandra.thrift.InvalidRequestException;
Modified: trunk/amdatu-core/cassandra-persistencemanager/pom.xml
==============================================================================
--- trunk/amdatu-core/cassandra-persistencemanager/pom.xml (original)
+++ trunk/amdatu-core/cassandra-persistencemanager/pom.xml Wed Nov 24
17:01:06 2010
@@ -4,18 +4,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.core</artifactId>
+ <artifactId>org.amdatu.cassandra</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>persistencemanager</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Core - Apache Cassandra Persistence Manager</name>
+ <name>Amdatu Cassandra - Apache Cassandra Persistence Manager</name>
<description>Provides a Persistence Manager to persist objects in
Cassandra</description>
<dependencies>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>application</artifactId>
<scope>provided</scope>
<type>bundle</type>
@@ -29,9 +29,9 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.core.cassandra.persistencemanager.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.core.cassandra.persistencemanager</Bundle-SymbolicName>
-
<Export-Package>org.amdatu.core.cassandra.persistencemanager</Export-Package>
+
<Bundle-Activator>org.amdatu.cassandra.persistencemanager.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.cassandra.persistencemanager</Bundle-SymbolicName>
+
<Export-Package>org.amdatu.cassandra.persistencemanager</Export-Package>
</instructions>
</configuration>
</plugin>
Copied:
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/CassandraException.java
(from r439,
/trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/CassandraException.java)
==============================================================================
---
/trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/CassandraException.java
(original)
+++
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/CassandraException.java
Wed Nov 24 17:01:06 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.persistencemanager;
+package org.amdatu.cassandra.persistencemanager;
import java.io.UnsupportedEncodingException;
Copied:
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/CassandraPersistenceManager.java
(from r439,
/trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/CassandraPersistenceManager.java)
==============================================================================
---
/trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/CassandraPersistenceManager.java
(original)
+++
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/CassandraPersistenceManager.java
Wed Nov 24 17:01:06 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.persistencemanager;
+package org.amdatu.cassandra.persistencemanager;
import java.util.List;
import java.util.Map;
Copied:
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/CassandraPersistenceManagerFactory.java
(from r439,
/trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/CassandraPersistenceManagerFactory.java)
==============================================================================
---
/trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/CassandraPersistenceManagerFactory.java
(original)
+++
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/CassandraPersistenceManagerFactory.java
Wed Nov 24 17:01:06 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.persistencemanager;
+package org.amdatu.cassandra.persistencemanager;
/**
* This is the factory service for Cassandra persistence managers. The
Cassandra persistence
Modified:
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/osgi/Activator.java
(original)
+++
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/osgi/Activator.java
Wed Nov 24 17:01:06 2010
@@ -14,11 +14,11 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.persistencemanager.osgi;
+package org.amdatu.cassandra.persistencemanager.osgi;
-import org.amdatu.core.cassandra.application.CassandraDaemonService;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
-import
org.amdatu.core.cassandra.persistencemanager.service.CassandraPersistenceManagerFactoryImpl;
+import org.amdatu.cassandra.application.CassandraDaemonService;
+import
org.amdatu.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
+import
org.amdatu.cassandra.persistencemanager.service.CassandraPersistenceManagerFactoryImpl;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/service/CassandraPersistenceManagerFactoryImpl.java
==============================================================================
---
/trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/service/CassandraPersistenceManagerFactoryImpl.java
(original)
+++
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/service/CassandraPersistenceManagerFactoryImpl.java
Wed Nov 24 17:01:06 2010
@@ -14,14 +14,14 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.persistencemanager.service;
+package org.amdatu.cassandra.persistencemanager.service;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.amdatu.core.cassandra.application.CassandraDaemonService;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
+import org.amdatu.cassandra.application.CassandraDaemonService;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
+import
org.amdatu.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
import org.osgi.service.log.LogService;
Modified:
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/service/CassandraPersistenceManagerImpl.java
==============================================================================
---
/trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/service/CassandraPersistenceManagerImpl.java
(original)
+++
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/service/CassandraPersistenceManagerImpl.java
Wed Nov 24 17:01:06 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.persistencemanager.service;
+package org.amdatu.cassandra.persistencemanager.service;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Method;
@@ -27,9 +27,9 @@
import java.util.Set;
import java.util.Map.Entry;
-import org.amdatu.core.cassandra.application.CassandraDaemonService;
-import org.amdatu.core.cassandra.persistencemanager.CassandraException;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.cassandra.application.CassandraDaemonService;
+import org.amdatu.cassandra.persistencemanager.CassandraException;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import org.apache.cassandra.thrift.Column;
import org.apache.cassandra.thrift.ColumnOrSuperColumn;
import org.apache.cassandra.thrift.ColumnParent;
Modified: trunk/amdatu-core/cassandra-tenantstore/pom.xml
==============================================================================
--- trunk/amdatu-core/cassandra-tenantstore/pom.xml (original)
+++ trunk/amdatu-core/cassandra-tenantstore/pom.xml Wed Nov 24 17:01:06 2010
@@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.core</artifactId>
+ <artifactId>org.amdatu.cassandra</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>tenantstore</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Core - Tenant Cassandra Store</name>
+ <name>Amdatu Cassandra - Tenant Cassandra Store</name>
<description>Provides an implementation of the Tenant store</description>
<dependencies>
@@ -22,20 +22,20 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>application</artifactId>
<version>${platform.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>persistencemanager</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>listener</artifactId>
<scope>provided</scope>
<type>bundle</type>
@@ -49,8 +49,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.core.cassandra.tenantstore.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.core.cassandra.tenantstore</Bundle-SymbolicName>
+
<Bundle-Activator>org.amdatu.cassandra.tenantstore.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.cassandra.tenantstore</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
Modified:
trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/tenantstore/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/core/cassandra/tenantstore/osgi/Activator.java
(original)
+++
trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/tenantstore/osgi/Activator.java
Wed Nov 24 17:01:06 2010
@@ -15,14 +15,14 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.tenantstore.osgi;
+package org.amdatu.cassandra.tenantstore.osgi;
-import org.amdatu.core.cassandra.application.CassandraDaemonService;
-import org.amdatu.core.cassandra.listener.ColumnFamilyAvailable;
-import org.amdatu.core.cassandra.listener.ColumnFamilyProvider;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
-import
org.amdatu.core.cassandra.tenantstore.service.TenantColumnFamilyProvider;
-import
org.amdatu.core.cassandra.tenantstore.service.TenantStorageProviderCassandraImpl;
+import org.amdatu.cassandra.application.CassandraDaemonService;
+import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
+import org.amdatu.cassandra.listener.ColumnFamilyProvider;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.cassandra.tenantstore.service.TenantColumnFamilyProvider;
+import
org.amdatu.cassandra.tenantstore.service.TenantStorageProviderCassandraImpl;
import org.amdatu.core.tenant.TenantStorageProvider;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
Modified:
trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/tenantstore/service/TenantColumnFamilyProvider.java
==============================================================================
---
/trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/core/cassandra/tenantstore/service/TenantColumnFamilyProvider.java
(original)
+++
trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/tenantstore/service/TenantColumnFamilyProvider.java
Wed Nov 24 17:01:06 2010
@@ -14,14 +14,14 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.tenantstore.service;
+package org.amdatu.cassandra.tenantstore.service;
-import org.amdatu.core.cassandra.listener.ColumnFamilyAvailable;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.ColumnType;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.CompareType;
-import org.amdatu.core.cassandra.listener.ColumnFamilyProvider;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
+import org.amdatu.cassandra.listener.ColumnFamilyDefinition;
+import org.amdatu.cassandra.listener.ColumnFamilyProvider;
+import org.amdatu.cassandra.listener.ColumnFamilyDefinition.ColumnType;
+import org.amdatu.cassandra.listener.ColumnFamilyDefinition.CompareType;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
/**
* This class provides the ColumnFamily 'Tenant' for the default keyspace.
Modified:
trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/tenantstore/service/TenantStorageProviderCassandraImpl.java
==============================================================================
---
/trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/core/cassandra/tenantstore/service/TenantStorageProviderCassandraImpl.java
(original)
+++
trunk/amdatu-core/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/tenantstore/service/TenantStorageProviderCassandraImpl.java
Wed Nov 24 17:01:06 2010
@@ -14,16 +14,16 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.tenantstore.service;
+package org.amdatu.cassandra.tenantstore.service;
-import static
org.amdatu.core.cassandra.tenantstore.service.TenantColumnFamilyProvider.CF_TENANT;
+import static
org.amdatu.cassandra.tenantstore.service.TenantColumnFamilyProvider.CF_TENANT;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.amdatu.core.cassandra.persistencemanager.CassandraException;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.cassandra.persistencemanager.CassandraException;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import org.amdatu.core.tenant.TenantEntity;
import org.amdatu.core.tenant.TenantStorageException;
import org.amdatu.core.tenant.TenantStorageProvider;
Modified:
trunk/amdatu-core/cassandra-tenantstore/src/test/java/org/amdatu/cassandra/tenantstore/service/TenantColumnFamilyProviderTest.java
==============================================================================
---
/trunk/amdatu-core/cassandra-tenantstore/src/test/java/org/amdatu/core/cassandra/tenantstore/service/TenantColumnFamilyProviderTest.java
(original)
+++
trunk/amdatu-core/cassandra-tenantstore/src/test/java/org/amdatu/cassandra/tenantstore/service/TenantColumnFamilyProviderTest.java
Wed Nov 24 17:01:06 2010
@@ -14,9 +14,10 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.tenantstore.service;
+package org.amdatu.cassandra.tenantstore.service;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition;
+import org.amdatu.cassandra.listener.ColumnFamilyDefinition;
+import org.amdatu.cassandra.tenantstore.service.TenantColumnFamilyProvider;
import org.junit.Assert;
import org.junit.Test;
Modified:
trunk/amdatu-core/cassandra-tenantstore/src/test/java/org/amdatu/cassandra/tenantstore/service/TenantStorageProviderCassandraImplTest.java
==============================================================================
---
/trunk/amdatu-core/cassandra-tenantstore/src/test/java/org/amdatu/core/cassandra/tenantstore/service/TenantStorageProviderCassandraImplTest.java
(original)
+++
trunk/amdatu-core/cassandra-tenantstore/src/test/java/org/amdatu/cassandra/tenantstore/service/TenantStorageProviderCassandraImplTest.java
Wed Nov 24 17:01:06 2010
@@ -14,8 +14,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.tenantstore.service;
+package org.amdatu.cassandra.tenantstore.service;
+import
org.amdatu.cassandra.tenantstore.service.TenantStorageProviderCassandraImpl;
import org.amdatu.core.tenant.TenantStorageProvider;
import org.junit.Assert;
import org.junit.Test;
Modified: trunk/amdatu-core/cassandra-useradminstore/pom.xml
==============================================================================
--- trunk/amdatu-core/cassandra-useradminstore/pom.xml (original)
+++ trunk/amdatu-core/cassandra-useradminstore/pom.xml Wed Nov 24 17:01:06 2010
@@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.core</artifactId>
+ <artifactId>org.amdatu.cassandra</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>useradminstore</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Core - User Admin Cassandra Store</name>
+ <name>Amdatu Cassandra - User Admin Cassandra Store</name>
<description>Provides an implementation of the Pax UserAdmin
store</description>
<dependencies>
@@ -20,19 +20,19 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>listener</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>application</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>persistencemanager</artifactId>
<scope>provided</scope>
<type>bundle</type>
@@ -71,9 +71,9 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.core.cassandra.useradminstore.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.core.cassandra.useradminstore</Bundle-SymbolicName>
-
<Export-Package>org.amdatu.core.cassandra.useradminstore</Export-Package>
+
<Bundle-Activator>org.amdatu.cassandra.useradminstore.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.cassandra.useradminstore</Bundle-SymbolicName>
+
<Export-Package>org.amdatu.cassandra.useradminstore</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
Copied:
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/DummyResourceInterface.java
(from r439,
/trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/DummyResourceInterface.java)
==============================================================================
---
/trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/DummyResourceInterface.java
(original)
+++
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/DummyResourceInterface.java
Wed Nov 24 17:01:06 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.useradminstore;
+package org.amdatu.cassandra.useradminstore;
/**
* Only necessary to register REST services.
Modified:
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/osgi/Activator.java
(original)
+++
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/osgi/Activator.java
Wed Nov 24 17:01:06 2010
@@ -14,20 +14,20 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.useradminstore.osgi;
+package org.amdatu.cassandra.useradminstore.osgi;
import java.util.Hashtable;
-import org.amdatu.core.cassandra.application.CassandraDaemonService;
-import org.amdatu.core.cassandra.listener.ColumnFamilyAvailable;
-import org.amdatu.core.cassandra.listener.ColumnFamilyProvider;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
-import org.amdatu.core.cassandra.useradminstore.DummyResourceInterface;
-import org.amdatu.core.cassandra.useradminstore.rest.GroupsResource;
-import
org.amdatu.core.cassandra.useradminstore.rest.HttpContextRegistrationServiceImpl;
-import org.amdatu.core.cassandra.useradminstore.rest.UsersResource;
-import
org.amdatu.core.cassandra.useradminstore.service.CassandraStorageProvider;
-import
org.amdatu.core.cassandra.useradminstore.service.RoleColumnFamilyProvider;
+import org.amdatu.cassandra.application.CassandraDaemonService;
+import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
+import org.amdatu.cassandra.listener.ColumnFamilyProvider;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.cassandra.useradminstore.DummyResourceInterface;
+import org.amdatu.cassandra.useradminstore.rest.GroupsResource;
+import
org.amdatu.cassandra.useradminstore.rest.HttpContextRegistrationServiceImpl;
+import org.amdatu.cassandra.useradminstore.rest.UsersResource;
+import org.amdatu.cassandra.useradminstore.service.CassandraStorageProvider;
+import org.amdatu.cassandra.useradminstore.service.RoleColumnFamilyProvider;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.DependencyActivatorBase;
Modified:
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/rest/GroupsResource.java
==============================================================================
---
/trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/rest/GroupsResource.java
(original)
+++
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/rest/GroupsResource.java
Wed Nov 24 17:01:06 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.useradminstore.rest;
+package org.amdatu.cassandra.useradminstore.rest;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
@@ -27,7 +27,7 @@
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.amdatu.core.cassandra.useradminstore.DummyResourceInterface;
+import org.amdatu.cassandra.useradminstore.DummyResourceInterface;
import org.osgi.service.useradmin.Group;
import org.osgi.service.useradmin.Role;
Modified:
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/rest/HttpContextRegistrationServiceImpl.java
==============================================================================
---
/trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/rest/HttpContextRegistrationServiceImpl.java
(original)
+++
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/rest/HttpContextRegistrationServiceImpl.java
Wed Nov 24 17:01:06 2010
@@ -14,13 +14,13 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.useradminstore.rest;
+package org.amdatu.cassandra.useradminstore.rest;
import java.net.URL;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.core.cassandra.useradminstore.osgi.Activator;
+import org.amdatu.cassandra.useradminstore.osgi.Activator;
import org.apache.felix.dm.Component;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
Modified:
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/rest/ResourceBase.java
==============================================================================
---
/trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/rest/ResourceBase.java
(original)
+++
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/rest/ResourceBase.java
Wed Nov 24 17:01:06 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.useradminstore.rest;
+package org.amdatu.cassandra.useradminstore.rest;
import java.util.ArrayList;
import java.util.Arrays;
Modified:
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/rest/UsersResource.java
==============================================================================
---
/trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/rest/UsersResource.java
(original)
+++
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/rest/UsersResource.java
Wed Nov 24 17:01:06 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.useradminstore.rest;
+package org.amdatu.cassandra.useradminstore.rest;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
@@ -28,7 +28,7 @@
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.amdatu.core.cassandra.useradminstore.DummyResourceInterface;
+import org.amdatu.cassandra.useradminstore.DummyResourceInterface;
import org.osgi.service.useradmin.Role;
/**
Modified:
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/service/CassandraStorageProvider.java
==============================================================================
---
/trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/service/CassandraStorageProvider.java
(original)
+++
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/service/CassandraStorageProvider.java
Wed Nov 24 17:01:06 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.useradminstore.service;
+package org.amdatu.cassandra.useradminstore.service;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -26,8 +26,8 @@
import java.util.List;
import java.util.Map;
-import org.amdatu.core.cassandra.persistencemanager.CassandraException;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.cassandra.persistencemanager.CassandraException;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import org.ops4j.pax.useradmin.service.spi.StorageException;
import org.ops4j.pax.useradmin.service.spi.StorageProvider;
import org.ops4j.pax.useradmin.service.spi.UserAdminFactory;
Modified:
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/service/RoleColumnFamilyProvider.java
==============================================================================
---
/trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/core/cassandra/useradminstore/service/RoleColumnFamilyProvider.java
(original)
+++
trunk/amdatu-core/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/service/RoleColumnFamilyProvider.java
Wed Nov 24 17:01:06 2010
@@ -14,13 +14,13 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.core.cassandra.useradminstore.service;
+package org.amdatu.cassandra.useradminstore.service;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.ColumnType;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.CompareType;
-import org.amdatu.core.cassandra.listener.ColumnFamilyProvider;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.cassandra.listener.ColumnFamilyDefinition;
+import org.amdatu.cassandra.listener.ColumnFamilyProvider;
+import org.amdatu.cassandra.listener.ColumnFamilyDefinition.ColumnType;
+import org.amdatu.cassandra.listener.ColumnFamilyDefinition.CompareType;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
/**
* This service only provides the Role Column Family. Note that the
CassandraStorageProvider has
Modified: trunk/amdatu-core/pom.xml
==============================================================================
--- trunk/amdatu-core/pom.xml (original)
+++ trunk/amdatu-core/pom.xml Wed Nov 24 17:01:06 2010
@@ -23,27 +23,6 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
- <artifactId>application</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
- <artifactId>listener</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
- <artifactId>persistencemanager</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<version>${platform.version}</version>
@@ -54,11 +33,6 @@
</dependencyManagement>
<modules>
- <module>cassandra-application</module>
- <module>cassandra-listener</module>
- <module>cassandra-persistencemanager</module>
- <module>cassandra-tenantstore</module>
- <module>cassandra-useradminstore</module>
<module>config-templates</module>
<module>config-filebased</module>
<module>loghandler</module>
Modified: trunk/amdatu-core/tenant/pom.xml
==============================================================================
--- trunk/amdatu-core/tenant/pom.xml (original)
+++ trunk/amdatu-core/tenant/pom.xml Wed Nov 24 17:01:06 2010
@@ -14,26 +14,6 @@
<description>This bundle provides a tenant management service with tenant
CRUD operations</description>
<dependencies>
- <!-- Regular dependencies -->
- <dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
- <artifactId>application</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
- <artifactId>persistencemanager</artifactId>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
- <artifactId>listener</artifactId>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
<dependency>
<groupId>org.amdatu.libraries</groupId>
<artifactId>utilities</artifactId>
Modified: trunk/amdatu-example/course-service/pom.xml
==============================================================================
--- trunk/amdatu-example/course-service/pom.xml (original)
+++ trunk/amdatu-example/course-service/pom.xml Wed Nov 24 17:01:06 2010
@@ -28,15 +28,17 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>listener</artifactId>
<scope>provided</scope>
+ <version>${platform.version}</version>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>application</artifactId>
<scope>provided</scope>
+ <version>${platform.version}</version>
<type>bundle</type>
</dependency>
<dependency>
Modified: trunk/amdatu-opensocial/gadgetmanagement/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/gadgetmanagement/pom.xml (original)
+++ trunk/amdatu-opensocial/gadgetmanagement/pom.xml Wed Nov 24 17:01:06 2010
@@ -27,14 +27,14 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>persistencemanager</artifactId>
<version>${platform.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>listener</artifactId>
<version>${platform.version}</version>
<scope>provided</scope>
Modified:
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
==============================================================================
---
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
Wed Nov 24 17:01:06 2010
@@ -16,13 +16,13 @@
*/
package org.amdatu.opensocial.gadgetmanagement.osgi;
+import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import
org.amdatu.opensocial.gadgetmanagement.service.GadgetManagementServiceImpl;
-import org.amdatu.core.cassandra.listener.ColumnFamilyAvailable;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.opensocial.shindig.GadgetStore;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.opensocial.shindig.GadgetStore;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
Wed Nov 24 17:01:06 2010
@@ -48,7 +48,7 @@
import javax.ws.rs.core.Response;
import org.amdatu.authorization.login.service.LoginService;
-import org.amdatu.core.cassandra.persistencemanager.CassandraException;
+import org.amdatu.cassandra.persistencemanager.CassandraException;
import org.amdatu.libraries.utilities.ConversionUtil;
import org.amdatu.opensocial.gadgetmanagement.DefaultGadgetRepository;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
Modified: trunk/amdatu-opensocial/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/pom.xml (original)
+++ trunk/amdatu-opensocial/pom.xml Wed Nov 24 17:01:06 2010
@@ -42,21 +42,21 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>application</artifactId>
<version>${platform.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>listener</artifactId>
<version>${platform.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>persistencemanager</artifactId>
<version>${platform.version}</version>
<scope>provided</scope>
Modified: trunk/amdatu-opensocial/profile/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/profile/pom.xml (original)
+++ trunk/amdatu-opensocial/profile/pom.xml Wed Nov 24 17:01:06 2010
@@ -21,7 +21,7 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>listener</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified:
trunk/amdatu-opensocial/profile/src/main/java/org/amdatu/opensocial/profile/osgi/Activator.java
==============================================================================
---
trunk/amdatu-opensocial/profile/src/main/java/org/amdatu/opensocial/profile/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/profile/src/main/java/org/amdatu/opensocial/profile/osgi/Activator.java
Wed Nov 24 17:01:06 2010
@@ -16,8 +16,8 @@
*/
package org.amdatu.opensocial.profile.osgi;
-import org.amdatu.core.cassandra.listener.ColumnFamilyAvailable;
-import org.amdatu.core.cassandra.listener.ColumnFamilyProvider;
+import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
+import org.amdatu.cassandra.listener.ColumnFamilyProvider;
import org.amdatu.opensocial.profile.PersonService;
import org.amdatu.opensocial.profile.service.FriendColumnFamilyProvider;
import org.amdatu.opensocial.profile.service.PersonServiceImpl;
Modified:
trunk/amdatu-opensocial/profile/src/main/java/org/amdatu/opensocial/profile/service/FriendColumnFamilyProvider.java
==============================================================================
---
trunk/amdatu-opensocial/profile/src/main/java/org/amdatu/opensocial/profile/service/FriendColumnFamilyProvider.java
(original)
+++
trunk/amdatu-opensocial/profile/src/main/java/org/amdatu/opensocial/profile/service/FriendColumnFamilyProvider.java
Wed Nov 24 17:01:06 2010
@@ -16,10 +16,10 @@
*/
package org.amdatu.opensocial.profile.service;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.ColumnType;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.CompareType;
-import org.amdatu.core.cassandra.listener.ColumnFamilyProvider;
+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;
/**
* Provides the "Friend" ColumnFamily.
Modified: trunk/amdatu-opensocial/shindig/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/shindig/pom.xml (original)
+++ trunk/amdatu-opensocial/shindig/pom.xml Wed Nov 24 17:01:06 2010
@@ -122,13 +122,13 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>persistencemanager</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>listener</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified:
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
==============================================================================
---
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
(original)
+++
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
Wed Nov 24 17:01:06 2010
@@ -18,7 +18,7 @@
import java.util.Map;
-import org.amdatu.core.cassandra.persistencemanager.CassandraException;
+import org.amdatu.cassandra.persistencemanager.CassandraException;
import org.apache.shindig.gadgets.oauth.BasicOAuthStoreConsumerKeyAndSecret;
public interface GadgetStore {
Modified:
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
==============================================================================
---
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
Wed Nov 24 17:01:06 2010
@@ -16,9 +16,9 @@
*/
package org.amdatu.opensocial.shindig.osgi;
-import org.amdatu.core.cassandra.listener.ColumnFamilyAvailable;
-import org.amdatu.core.cassandra.listener.ColumnFamilyProvider;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
+import org.amdatu.cassandra.listener.ColumnFamilyProvider;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import org.amdatu.opensocial.shindig.GadgetStore;
import org.amdatu.opensocial.shindig.OAuthModule;
import org.amdatu.opensocial.shindig.ShindigService;
Modified:
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetColumnFamilyProvider.java
==============================================================================
---
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetColumnFamilyProvider.java
(original)
+++
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetColumnFamilyProvider.java
Wed Nov 24 17:01:06 2010
@@ -16,11 +16,11 @@
*/
package org.amdatu.opensocial.shindig.persistence;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.ColumnType;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.CompareType;
-import org.amdatu.core.cassandra.listener.ColumnFamilyProvider;
-import
org.amdatu.core.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;
import org.amdatu.opensocial.shindig.GadgetStore;
/**
Modified:
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetStoreImpl.java
==============================================================================
---
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetStoreImpl.java
(original)
+++
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetStoreImpl.java
Wed Nov 24 17:01:06 2010
@@ -26,8 +26,8 @@
import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.amdatu.core.cassandra.persistencemanager.CassandraException;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.cassandra.persistencemanager.CassandraException;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import org.amdatu.opensocial.shindig.GadgetCategory;
import org.amdatu.opensocial.shindig.GadgetDefinition;
import org.amdatu.opensocial.shindig.GadgetStore;
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Wed Nov 24 17:01:06 2010
@@ -29,35 +29,35 @@
<!-- Core bundles -->
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>application</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>listener</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>persistencemanager</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>useradminstore</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>tenantstore</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
Modified: trunk/amdatu-release/src/main/assembly/bin-component.xml
==============================================================================
--- trunk/amdatu-release/src/main/assembly/bin-component.xml (original)
+++ trunk/amdatu-release/src/main/assembly/bin-component.xml Wed Nov 24
17:01:06 2010
@@ -15,6 +15,8 @@
<includes>
<include>org.amdatu.authorization:*</include>
<include>org.amdatu.authorization.*:*</include>
+ <include>org.amdatu.cassandra:*</include>
+ <include>org.amdatu.cassandra.*:*</include>
<include>org.amdatu.opensocial:*</include>
<include>org.amdatu.opensocial.*:*</include>
<include>org.amdatu.semanticweb:*</include>
Modified: trunk/integration-tests/pom.xml
==============================================================================
--- trunk/integration-tests/pom.xml (original)
+++ trunk/integration-tests/pom.xml Wed Nov 24 17:01:06 2010
@@ -97,28 +97,28 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>application</artifactId>
<version>${platform.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>persistencemanager</artifactId>
<version>${platform.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>listener</artifactId>
<version>${platform.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>useradminstore</artifactId>
<version>${platform.version}</version>
<scope>test</scope>
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
Wed Nov 24 17:01:06 2010
@@ -267,7 +267,7 @@
}
protected static MavenArtifactProvisionOption
amdatuUserAdminCassandraStore() {
- return
mavenBundle().groupId("org.amdatu.core.cassandra").artifactId("useradminstore").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.cassandra").artifactId("useradminstore").versionAsInProject();
}
protected static MavenArtifactProvisionOption amdatuTenantService() {
@@ -279,15 +279,15 @@
}
protected static MavenArtifactProvisionOption
amdatuCassandraPersistenceManager() {
- return
mavenBundle().groupId("org.amdatu.core.cassandra").artifactId("persistencemanager").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.cassandra").artifactId("persistencemanager").versionAsInProject();
}
protected static MavenArtifactProvisionOption amdatuCassandraListener() {
- return
mavenBundle().groupId("org.amdatu.core.cassandra").artifactId("listener").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.cassandra").artifactId("listener").versionAsInProject();
}
protected static MavenArtifactProvisionOption amdatuCassandraApplication()
{
- return
mavenBundle().groupId("org.amdatu.core.cassandra").artifactId("application").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.cassandra").artifactId("application").versionAsInProject();
}
protected static MavenArtifactProvisionOption
amdatuConfigTemplateManager() {
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraDaemonIntegrationTest.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraDaemonIntegrationTest.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraDaemonIntegrationTest.java
Wed Nov 24 17:01:06 2010
@@ -22,10 +22,10 @@
import junit.framework.Assert;
-import org.amdatu.core.cassandra.application.CassandraDaemonService;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.ColumnType;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.CompareType;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.cassandra.application.CassandraDaemonService;
+import org.amdatu.cassandra.listener.ColumnFamilyDefinition.ColumnType;
+import org.amdatu.cassandra.listener.ColumnFamilyDefinition.CompareType;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import org.amdatu.test.integration.base.IntegrationTestBase;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.thrift.InvalidRequestException;
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraPersistenceManagerTest.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraPersistenceManagerTest.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraPersistenceManagerTest.java
Wed Nov 24 17:01:06 2010
@@ -23,12 +23,12 @@
import junit.framework.Assert;
-import org.amdatu.core.cassandra.application.CassandraDaemonService;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.ColumnType;
-import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.CompareType;
-import org.amdatu.core.cassandra.persistencemanager.CassandraException;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
-import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
+import org.amdatu.cassandra.application.CassandraDaemonService;
+import org.amdatu.cassandra.listener.ColumnFamilyDefinition.ColumnType;
+import org.amdatu.cassandra.listener.ColumnFamilyDefinition.CompareType;
+import org.amdatu.cassandra.persistencemanager.CassandraException;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
+import
org.amdatu.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
import org.amdatu.test.integration.base.IntegrationTestBase;
import org.apache.cassandra.db.Table;
import org.apache.felix.dm.Component;
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Wed Nov 24 17:01:06 2010
@@ -344,6 +344,7 @@
<!-- AMDATU-157 buildsupport must be first in reactor -->
<module>amdatu-buildsupport</module>
<module>amdatu-authorization</module>
+ <module>amdatu-cassandra</module>
<module>amdatu-core</module>
<module>amdatu-example</module>
<module>amdatu-libraries</module>
Modified: trunk/src/main/resources/conf/felix-config.properties
==============================================================================
--- trunk/src/main/resources/conf/felix-config.properties (original)
+++ trunk/src/main/resources/conf/felix-config.properties Wed Nov 24
17:01:06 2010
@@ -97,14 +97,14 @@
reference:file:amdatu-system/ops4j-base-lang-1.2.2.jar \
reference:file:amdatu-system/org.apache.felix.scr-1.6.0.jar
felix.auto.start.2=reference:file:amdatu-core/org.amdatu.core.config.filebased-${platform.version}.jar
\
-
reference:file:amdatu-core/org.amdatu.core.cassandra.application-${platform.version}.jar
\
-
reference:file:amdatu-core/org.amdatu.core.cassandra.listener-${platform.version}.jar
\
-
reference:file:amdatu-core/org.amdatu.core.cassandra.persistencemanager-${platform.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.cassandra.application-${platform.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.cassandra.listener-${platform.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.cassandra.persistencemanager-${platform.version}.jar
\
reference:file:amdatu-core/org.amdatu.core.loghandler-${platform.version}.jar \
reference:file:amdatu-core/org.amdatu.core.tenant-${platform.version}.jar \
reference:file:amdatu-core/org.amdatu.core.config.templates-${platform.version}.jar
\
-
reference:file:amdatu-core/org.amdatu.core.cassandra.tenantstore-${platform.version}.jar
\
-
reference:file:amdatu-core/org.amdatu.core.cassandra.useradminstore-${platform.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.cassandra.tenantstore-${platform.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.cassandra.useradminstore-${platform.version}.jar
\
reference:file:amdatu-application/org.amdatu.web.rest.jaxrs-${platform.version}.jar
\
reference:file:amdatu-application/org.amdatu.web.rest.wink-${platform.version}.jar
felix.auto.start.10=reference:file:amdatu-application/org.amdatu.opensocial.shindig-${platform.version}.jar
\
