Author: ivol37 at gmail.com
Date: Wed Nov 10 08:50:06 2010
New Revision: 321
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Modified:
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/loginservice/osgi/Activator.java
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/Activator.java
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/service/CassandraConfigurationServiceImpl.java
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/cassandra/application/service/CassandraDaemonServiceImpl.java
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/Activator.java
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/service/CassandraDaemonServiceListener.java
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/service/ColumnFamilyAvailableImpl.java
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/cassandra/listener/service/ColumnFamilyProviderListener.java
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/Activator.java
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/service/CassandraPersistenceManagerFactoryImpl.java
trunk/amdatu-core/cassandra-persistencemanager/src/main/java/org/amdatu/core/cassandra/persistencemanager/service/CassandraPersistenceManagerImpl.java
trunk/amdatu-core/config-template-manager/src/main/java/org/amdatu/core/configtemplatemanager/ConfigTemplateManager.java
trunk/amdatu-core/config-template-manager/src/main/java/org/amdatu/core/configtemplatemanager/osgi/Activator.java
trunk/amdatu-core/config-template-manager/src/main/java/org/amdatu/core/configtemplatemanager/service/ConfigTemplateManagerImpl.java
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/osgi/Activator.java
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/service/ConsoleLogHandler.java
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/service/JdkLogForwarder.java
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/Tenant.java
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantEntity.java
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantException.java
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantManagementService.java
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantStorageException.java
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantStorageProvider.java
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/dao/TenantColumnFamilyProvider.java
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/dao/TenantStorageProviderCassandraImpl.java
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/osgi/Activator.java
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/service/TenantManagementServiceImpl.java
trunk/amdatu-core/tenant-service/src/test/java/org/amdatu/test/unit/InMemoryTenantStorageProvider.java
trunk/amdatu-core/tenant-service/src/test/java/org/amdatu/test/unit/TenantManagementServiceTest.java
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/DummyResourceInterface.java
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/osgi/Activator.java
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/rest/GroupsResource.java
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/rest/HttpContextRegistrationServiceImpl.java
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/rest/ResourceBase.java
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/rest/UsersResource.java
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/service/CassandraStorageProvider.java
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/service/RoleColumnFamilyProvider.java
trunk/amdatu-core/wink-application/src/main/java/org/amdatu/core/wink/osgi/Activator.java
trunk/amdatu-core/wink-application/src/main/java/org/amdatu/core/wink/service/WinkRegistrationServiceImpl.java
trunk/amdatu-core/wink-application/src/main/java/org/amdatu/core/wink/service/WinkRestServlet.java
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseOntologyDataProvider.java
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseResource.java
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/osgi/Activator.java
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/PersonService.java
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/osgi/Activator.java
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/service/FriendColumnFamilyProvider.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetColumnFamilyProvider.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetStoreImpl.java
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
trunk/integration-tests/src/test/java/org/amdatu/test/integration/mock/InMemoryTenantStorageProvider.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/integration-tests/src/test/java/org/amdatu/test/integration/tests/TenantManagementServiceTest.java
Modified:
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/loginservice/osgi/Activator.java
==============================================================================
---
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/loginservice/osgi/Activator.java
(original)
+++
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/loginservice/osgi/Activator.java
Wed Nov 10 08:50:06 2010
@@ -18,7 +18,7 @@
import org.amdatu.authorization.loginservice.AuthorizationService;
import org.amdatu.authorization.loginservice.service.AuthorizationServiceImpl;
-import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
+import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
Modified:
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/core/cassandra/application/CassandraConfigurationService.java
Wed Nov 10 08:50: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.platform.cassandra.application;
+package org.amdatu.core.cassandra.application;
/**
* Interface for the Cassandra Configuration Service.
@@ -35,7 +35,7 @@
/**
* The service's configuration PID
*/
- public static final String PID =
"org.amdatu.platform.cassandra.application";
+ public static final String PID = "org.amdatu.core.cassandra.application";
/**
* Configuration key for the working directory to use for Cassandra
Modified:
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/core/cassandra/application/CassandraDaemonService.java
Wed Nov 10 08:50: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.platform.cassandra.application;
+package org.amdatu.core.cassandra.application;
import java.util.List;
Modified:
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/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/core/cassandra/application/osgi/Activator.java
Wed Nov 10 08:50: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.platform.cassandra.application.osgi;
+package org.amdatu.core.cassandra.application.osgi;
-import org.amdatu.platform.cassandra.application.CassandraConfigurationService;
-import org.amdatu.platform.cassandra.application.CassandraDaemonService;
-import
org.amdatu.platform.cassandra.application.service.CassandraConfigurationServiceImpl;
-import
org.amdatu.platform.cassandra.application.service.CassandraDaemonServiceImpl;
-import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
+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.core.configtemplatemanager.ConfigTemplateManager;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/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/core/cassandra/application/service/CassandraConfigurationServiceImpl.java
Wed Nov 10 08:50:06 2010
@@ -14,15 +14,15 @@
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.platform.cassandra.application.service;
+package org.amdatu.core.cassandra.application.service;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.Dictionary;
-import org.amdatu.platform.cassandra.application.CassandraConfigurationService;
-import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
+import org.amdatu.core.cassandra.application.CassandraConfigurationService;
+import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
import org.apache.log4j.PropertyConfigurator;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-core/cassandra-application/src/main/java/org/amdatu/core/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/core/cassandra/application/service/CassandraDaemonServiceImpl.java
Wed Nov 10 08:50: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.platform.cassandra.application.service;
+package org.amdatu.core.cassandra.application.service;
import java.util.ArrayList;
import java.util.List;
-import org.amdatu.platform.cassandra.application.CassandraDaemonService;
+import org.amdatu.core.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/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/core/cassandra/listener/ColumnFamilyAvailable.java
Wed Nov 10 08:50: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.platform.cassandra.listener;
+package org.amdatu.core.cassandra.listener;
/**
* In some cases a service depends on the availability of a certain
ColumnFamily.
Modified:
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/core/cassandra/listener/ColumnFamilyDefinition.java
Wed Nov 10 08:50: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.platform.cassandra.listener;
+package org.amdatu.core.cassandra.listener;
/**
* This class holds the definition of a ColumnFamily to be used by the
ColumnFamilyProvider.
Modified:
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/core/cassandra/listener/ColumnFamilyProvider.java
Wed Nov 10 08:50: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.platform.cassandra.listener;
+package org.amdatu.core.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/core/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/core/cassandra/listener/osgi/Activator.java
Wed Nov 10 08:50: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.platform.cassandra.listener.osgi;
+package org.amdatu.core.cassandra.listener.osgi;
-import org.amdatu.platform.cassandra.application.CassandraDaemonService;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider;
-import
org.amdatu.platform.cassandra.listener.service.CassandraDaemonServiceListener;
-import
org.amdatu.platform.cassandra.listener.service.ColumnFamilyProviderListener;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
+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.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/core/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/core/cassandra/listener/service/CassandraDaemonServiceListener.java
Wed Nov 10 08:50: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.platform.cassandra.listener.service;
+package org.amdatu.core.cassandra.listener.service;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.List;
-import org.amdatu.platform.cassandra.application.CassandraDaemonService;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyAvailable;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
+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.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/core/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/core/cassandra/listener/service/ColumnFamilyAvailableImpl.java
Wed Nov 10 08:50: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.platform.cassandra.listener.service;
+package org.amdatu.core.cassandra.listener.service;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyAvailable;
+import org.amdatu.core.cassandra.listener.ColumnFamilyAvailable;
/**
* Service implementation of the ColumnFamilyAvailable. The implementation is
Modified:
trunk/amdatu-core/cassandra-listener/src/main/java/org/amdatu/core/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/core/cassandra/listener/service/ColumnFamilyProviderListener.java
Wed Nov 10 08:50: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.platform.cassandra.listener.service;
+package org.amdatu.core.cassandra.listener.service;
import java.util.List;
-import org.amdatu.platform.cassandra.application.CassandraDaemonService;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider;
+import org.amdatu.core.cassandra.application.CassandraDaemonService;
+import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition;
+import org.amdatu.core.cassandra.listener.ColumnFamilyProvider;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.thrift.CassandraServer;
import org.apache.cassandra.thrift.InvalidRequestException;
Modified:
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/core/cassandra/persistencemanager/CassandraException.java
Wed Nov 10 08:50: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.platform.cassandra.persistencemanager;
+package org.amdatu.core.cassandra.persistencemanager;
import java.io.UnsupportedEncodingException;
Modified:
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/core/cassandra/persistencemanager/CassandraPersistenceManager.java
Wed Nov 10 08:50: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.platform.cassandra.persistencemanager;
+package org.amdatu.core.cassandra.persistencemanager;
import java.util.List;
import java.util.Map;
Modified:
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/core/cassandra/persistencemanager/CassandraPersistenceManagerFactory.java
Wed Nov 10 08:50: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.platform.cassandra.persistencemanager;
+package org.amdatu.core.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/core/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/core/cassandra/persistencemanager/osgi/Activator.java
Wed Nov 10 08:50: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.platform.cassandra.persistencemanager.osgi;
+package org.amdatu.core.cassandra.persistencemanager.osgi;
-import org.amdatu.platform.cassandra.application.CassandraDaemonService;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
-import
org.amdatu.platform.cassandra.persistencemanager.service.CassandraPersistenceManagerFactoryImpl;
+import org.amdatu.core.cassandra.application.CassandraDaemonService;
+import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
+import
org.amdatu.core.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/core/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/core/cassandra/persistencemanager/service/CassandraPersistenceManagerFactoryImpl.java
Wed Nov 10 08:50: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.platform.cassandra.persistencemanager.service;
+package org.amdatu.core.cassandra.persistencemanager.service;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.amdatu.platform.cassandra.application.CassandraDaemonService;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
+import org.amdatu.core.cassandra.application.CassandraDaemonService;
+import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
+import
org.amdatu.core.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/core/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/core/cassandra/persistencemanager/service/CassandraPersistenceManagerImpl.java
Wed Nov 10 08:50: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.platform.cassandra.persistencemanager.service;
+package org.amdatu.core.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.platform.cassandra.application.CassandraDaemonService;
-import org.amdatu.platform.cassandra.persistencemanager.CassandraException;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.core.cassandra.application.CassandraDaemonService;
+import org.amdatu.core.cassandra.persistencemanager.CassandraException;
+import
org.amdatu.core.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/config-template-manager/src/main/java/org/amdatu/core/configtemplatemanager/ConfigTemplateManager.java
==============================================================================
---
trunk/amdatu-core/config-template-manager/src/main/java/org/amdatu/core/configtemplatemanager/ConfigTemplateManager.java
(original)
+++
trunk/amdatu-core/config-template-manager/src/main/java/org/amdatu/core/configtemplatemanager/ConfigTemplateManager.java
Wed Nov 10 08:50: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.platform.configtemplatemanager;
+package org.amdatu.core.configtemplatemanager;
import java.io.BufferedWriter;
import java.io.File;
Modified:
trunk/amdatu-core/config-template-manager/src/main/java/org/amdatu/core/configtemplatemanager/osgi/Activator.java
==============================================================================
---
trunk/amdatu-core/config-template-manager/src/main/java/org/amdatu/core/configtemplatemanager/osgi/Activator.java
(original)
+++
trunk/amdatu-core/config-template-manager/src/main/java/org/amdatu/core/configtemplatemanager/osgi/Activator.java
Wed Nov 10 08:50:06 2010
@@ -14,10 +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.platform.configtemplatemanager.osgi;
+package org.amdatu.core.configtemplatemanager.osgi;
-import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
-import
org.amdatu.platform.configtemplatemanager.service.ConfigTemplateManagerImpl;
+import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
+import org.amdatu.core.configtemplatemanager.service.ConfigTemplateManagerImpl;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.DependencyActivatorBase;
Modified:
trunk/amdatu-core/config-template-manager/src/main/java/org/amdatu/core/configtemplatemanager/service/ConfigTemplateManagerImpl.java
==============================================================================
---
trunk/amdatu-core/config-template-manager/src/main/java/org/amdatu/core/configtemplatemanager/service/ConfigTemplateManagerImpl.java
(original)
+++
trunk/amdatu-core/config-template-manager/src/main/java/org/amdatu/core/configtemplatemanager/service/ConfigTemplateManagerImpl.java
Wed Nov 10 08:50: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.platform.configtemplatemanager.service;
+package org.amdatu.core.configtemplatemanager.service;
import java.io.*;
import java.net.MalformedURLException;
@@ -26,8 +26,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
-import org.amdatu.platform.configtemplatemanager.osgi.Activator;
+import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
+import org.amdatu.core.configtemplatemanager.osgi.Activator;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.Component;
Modified:
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/osgi/Activator.java
==============================================================================
---
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/osgi/Activator.java
(original)
+++
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/osgi/Activator.java
Wed Nov 10 08:50: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.platform.loghandler.osgi;
+package org.amdatu.core.loghandler.osgi;
import java.util.Properties;
-import org.amdatu.platform.loghandler.service.ConsoleLogHandler;
-import org.amdatu.platform.loghandler.service.JdkLogForwarder;
+import org.amdatu.core.loghandler.service.ConsoleLogHandler;
+import org.amdatu.core.loghandler.service.JdkLogForwarder;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/service/ConsoleLogHandler.java
==============================================================================
---
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/service/ConsoleLogHandler.java
(original)
+++
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/service/ConsoleLogHandler.java
Wed Nov 10 08:50: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.platform.loghandler.service;
+package org.amdatu.core.loghandler.service;
import java.util.Dictionary;
import java.util.HashMap;
@@ -46,7 +46,7 @@
// Name of the configuration PID and property that determines the minimum
log level
// of entries to print to the console
- public static final String PID = "org.amdatu.platform.loghandler";
+ public static final String PID = "org.amdatu.core.loghandler";
private static final String MIN_LOGLEVEL_KEY = "console.mininum.loglevel";
public void logReaderAdded(LogReaderService reader) {
Modified:
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/service/JdkLogForwarder.java
==============================================================================
---
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/service/JdkLogForwarder.java
(original)
+++
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/service/JdkLogForwarder.java
Wed Nov 10 08:50: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.platform.loghandler.service;
+package org.amdatu.core.loghandler.service;
import java.util.ArrayList;
import java.util.Enumeration;
Modified:
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/Tenant.java
==============================================================================
---
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/Tenant.java
(original)
+++
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/Tenant.java
Wed Nov 10 08:50:06 2010
@@ -15,7 +15,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.platform.tenant;
+package org.amdatu.core.tenant;
import java.util.Map;
Modified:
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantEntity.java
==============================================================================
---
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantEntity.java
(original)
+++
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantEntity.java
Wed Nov 10 08:50:06 2010
@@ -15,7 +15,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.platform.tenant;
+package org.amdatu.core.tenant;
import java.util.HashMap;
import java.util.Map;
Modified:
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantException.java
==============================================================================
---
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantException.java
(original)
+++
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantException.java
Wed Nov 10 08:50:06 2010
@@ -15,7 +15,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.platform.tenant;
+package org.amdatu.core.tenant;
/**
* This exception signifies a logical error, e.g. trying to create a tenant
with an ID that is already in use.
Modified:
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantManagementService.java
==============================================================================
---
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantManagementService.java
(original)
+++
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantManagementService.java
Wed Nov 10 08:50:06 2010
@@ -15,7 +15,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.platform.tenant;
+package org.amdatu.core.tenant;
import java.util.List;
import java.util.Map;
Modified:
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantStorageException.java
==============================================================================
---
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantStorageException.java
(original)
+++
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantStorageException.java
Wed Nov 10 08:50:06 2010
@@ -1,4 +1,4 @@
-package org.amdatu.platform.tenant;
+package org.amdatu.core.tenant;
/**
* This exception signifies a problem in reading or writing from/to the
persistent storage.
Modified:
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantStorageProvider.java
==============================================================================
---
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantStorageProvider.java
(original)
+++
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/TenantStorageProvider.java
Wed Nov 10 08:50: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.platform.tenant;
+package org.amdatu.core.tenant;
import java.util.List;
Modified:
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/dao/TenantColumnFamilyProvider.java
==============================================================================
---
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/dao/TenantColumnFamilyProvider.java
(original)
+++
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/dao/TenantColumnFamilyProvider.java
Wed Nov 10 08:50: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.platform.tenant.dao;
+package org.amdatu.core.tenant.dao;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyAvailable;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition;
-import
org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.ColumnType;
-import
org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.CompareType;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
+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;
/**
* This class provides the ColumnFamily 'Tenant' for the default keyspace.
Modified:
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/dao/TenantStorageProviderCassandraImpl.java
==============================================================================
---
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/dao/TenantStorageProviderCassandraImpl.java
(original)
+++
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/dao/TenantStorageProviderCassandraImpl.java
Wed Nov 10 08:50:06 2010
@@ -14,19 +14,19 @@
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.platform.tenant.dao;
+package org.amdatu.core.tenant.dao;
-import static
org.amdatu.platform.tenant.dao.TenantColumnFamilyProvider.CF_TENANT;
+import static org.amdatu.core.tenant.dao.TenantColumnFamilyProvider.CF_TENANT;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.amdatu.platform.cassandra.persistencemanager.CassandraException;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
-import org.amdatu.platform.tenant.TenantEntity;
-import org.amdatu.platform.tenant.TenantStorageException;
-import org.amdatu.platform.tenant.TenantStorageProvider;
+import org.amdatu.core.cassandra.persistencemanager.CassandraException;
+import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.core.tenant.TenantEntity;
+import org.amdatu.core.tenant.TenantStorageException;
+import org.amdatu.core.tenant.TenantStorageProvider;
public class TenantStorageProviderCassandraImpl implements
TenantStorageProvider {
// Name of the supercolumns
Modified:
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/osgi/Activator.java
==============================================================================
---
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/osgi/Activator.java
(original)
+++
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/osgi/Activator.java
Wed Nov 10 08:50:06 2010
@@ -15,17 +15,17 @@
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.platform.tenant.osgi;
+package org.amdatu.core.tenant.osgi;
-import org.amdatu.platform.cassandra.application.CassandraDaemonService;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyAvailable;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
-import org.amdatu.platform.tenant.TenantManagementService;
-import org.amdatu.platform.tenant.TenantStorageProvider;
-import org.amdatu.platform.tenant.dao.TenantColumnFamilyProvider;
-import org.amdatu.platform.tenant.dao.TenantStorageProviderCassandraImpl;
-import org.amdatu.platform.tenant.service.TenantManagementServiceImpl;
+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.tenant.TenantManagementService;
+import org.amdatu.core.tenant.TenantStorageProvider;
+import org.amdatu.core.tenant.dao.TenantColumnFamilyProvider;
+import org.amdatu.core.tenant.dao.TenantStorageProviderCassandraImpl;
+import org.amdatu.core.tenant.service.TenantManagementServiceImpl;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/service/TenantManagementServiceImpl.java
==============================================================================
---
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/service/TenantManagementServiceImpl.java
(original)
+++
trunk/amdatu-core/tenant-service/src/main/java/org/amdatu/core/tenant/service/TenantManagementServiceImpl.java
Wed Nov 10 08:50: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.platform.tenant.service;
+package org.amdatu.core.tenant.service;
import java.util.*;
-import org.amdatu.platform.tenant.*;
+import org.amdatu.core.tenant.*;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
Modified:
trunk/amdatu-core/tenant-service/src/test/java/org/amdatu/test/unit/InMemoryTenantStorageProvider.java
==============================================================================
---
trunk/amdatu-core/tenant-service/src/test/java/org/amdatu/test/unit/InMemoryTenantStorageProvider.java
(original)
+++
trunk/amdatu-core/tenant-service/src/test/java/org/amdatu/test/unit/InMemoryTenantStorageProvider.java
Wed Nov 10 08:50:06 2010
@@ -21,8 +21,8 @@
import java.util.List;
import java.util.Map;
-import org.amdatu.platform.tenant.TenantEntity;
-import org.amdatu.platform.tenant.TenantStorageProvider;
+import org.amdatu.core.tenant.TenantEntity;
+import org.amdatu.core.tenant.TenantStorageProvider;
/**
* This service provides an in-memory implementation of the
TenantStorageProvider, used for unit testing.
Modified:
trunk/amdatu-core/tenant-service/src/test/java/org/amdatu/test/unit/TenantManagementServiceTest.java
==============================================================================
---
trunk/amdatu-core/tenant-service/src/test/java/org/amdatu/test/unit/TenantManagementServiceTest.java
(original)
+++
trunk/amdatu-core/tenant-service/src/test/java/org/amdatu/test/unit/TenantManagementServiceTest.java
Wed Nov 10 08:50:06 2010
@@ -23,11 +23,11 @@
import java.util.Map;
import org.amdatu.libraries.utilities.TestUtil;
-import org.amdatu.platform.tenant.TenantEntity;
-import org.amdatu.platform.tenant.TenantException;
-import org.amdatu.platform.tenant.TenantManagementService;
-import org.amdatu.platform.tenant.TenantStorageProvider;
-import org.amdatu.platform.tenant.service.TenantManagementServiceImpl;
+import org.amdatu.core.tenant.TenantEntity;
+import org.amdatu.core.tenant.TenantException;
+import org.amdatu.core.tenant.TenantManagementService;
+import org.amdatu.core.tenant.TenantStorageProvider;
+import org.amdatu.core.tenant.service.TenantManagementServiceImpl;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
import org.junit.Before;
Modified:
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/DummyResourceInterface.java
==============================================================================
---
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/DummyResourceInterface.java
(original)
+++
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/DummyResourceInterface.java
Wed Nov 10 08:50: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.platform.useradmin.store.cassandra;
+package org.amdatu.core.useradmin.store.cassandra;
/**
* Only necessary to register REST services.
Modified:
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/osgi/Activator.java
==============================================================================
---
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/osgi/Activator.java
(original)
+++
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/osgi/Activator.java
Wed Nov 10 08:50:06 2010
@@ -14,22 +14,22 @@
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.platform.useradmin.store.cassandra.osgi;
+package org.amdatu.core.useradmin.store.cassandra.osgi;
import java.util.Hashtable;
-import org.amdatu.platform.cassandra.application.CassandraDaemonService;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyAvailable;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
+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.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.platform.useradmin.store.cassandra.DummyResourceInterface;
-import org.amdatu.platform.useradmin.store.cassandra.rest.GroupsResource;
-import
org.amdatu.platform.useradmin.store.cassandra.rest.HttpContextRegistrationServiceImpl;
-import org.amdatu.platform.useradmin.store.cassandra.rest.UsersResource;
-import
org.amdatu.platform.useradmin.store.cassandra.service.CassandraStorageProvider;
-import
org.amdatu.platform.useradmin.store.cassandra.service.RoleColumnFamilyProvider;
+import org.amdatu.core.useradmin.store.cassandra.DummyResourceInterface;
+import org.amdatu.core.useradmin.store.cassandra.rest.GroupsResource;
+import
org.amdatu.core.useradmin.store.cassandra.rest.HttpContextRegistrationServiceImpl;
+import org.amdatu.core.useradmin.store.cassandra.rest.UsersResource;
+import
org.amdatu.core.useradmin.store.cassandra.service.CassandraStorageProvider;
+import
org.amdatu.core.useradmin.store.cassandra.service.RoleColumnFamilyProvider;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.ops4j.pax.useradmin.service.UserAdminConstants;
Modified:
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/rest/GroupsResource.java
==============================================================================
---
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/rest/GroupsResource.java
(original)
+++
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/rest/GroupsResource.java
Wed Nov 10 08:50: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.platform.useradmin.store.cassandra.rest;
+package org.amdatu.core.useradmin.store.cassandra.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.platform.useradmin.store.cassandra.DummyResourceInterface;
+import org.amdatu.core.useradmin.store.cassandra.DummyResourceInterface;
import org.osgi.service.useradmin.Group;
import org.osgi.service.useradmin.Role;
Modified:
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/rest/HttpContextRegistrationServiceImpl.java
==============================================================================
---
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/rest/HttpContextRegistrationServiceImpl.java
(original)
+++
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/rest/HttpContextRegistrationServiceImpl.java
Wed Nov 10 08:50: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.platform.useradmin.store.cassandra.rest;
+package org.amdatu.core.useradmin.store.cassandra.rest;
import java.net.URL;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.platform.useradmin.store.cassandra.osgi.Activator;
+import org.amdatu.core.useradmin.store.cassandra.osgi.Activator;
import org.apache.felix.dm.Component;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
Modified:
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/rest/ResourceBase.java
==============================================================================
---
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/rest/ResourceBase.java
(original)
+++
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/rest/ResourceBase.java
Wed Nov 10 08:50: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.platform.useradmin.store.cassandra.rest;
+package org.amdatu.core.useradmin.store.cassandra.rest;
import java.util.ArrayList;
import java.util.Arrays;
Modified:
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/rest/UsersResource.java
==============================================================================
---
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/rest/UsersResource.java
(original)
+++
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/rest/UsersResource.java
Wed Nov 10 08:50: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.platform.useradmin.store.cassandra.rest;
+package org.amdatu.core.useradmin.store.cassandra.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.platform.useradmin.store.cassandra.DummyResourceInterface;
+import org.amdatu.core.useradmin.store.cassandra.DummyResourceInterface;
import org.osgi.service.useradmin.Role;
/**
Modified:
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/service/CassandraStorageProvider.java
==============================================================================
---
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/service/CassandraStorageProvider.java
(original)
+++
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/service/CassandraStorageProvider.java
Wed Nov 10 08:50: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.platform.useradmin.store.cassandra.service;
+package org.amdatu.core.useradmin.store.cassandra.service;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -26,8 +26,8 @@
import java.util.List;
import java.util.Map;
-import org.amdatu.platform.cassandra.persistencemanager.CassandraException;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.core.cassandra.persistencemanager.CassandraException;
+import
org.amdatu.core.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/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/service/RoleColumnFamilyProvider.java
==============================================================================
---
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/service/RoleColumnFamilyProvider.java
(original)
+++
trunk/amdatu-core/useradmin-cassandra-store/src/main/java/org/amdatu/core/useradmin/store/cassandra/service/RoleColumnFamilyProvider.java
Wed Nov 10 08:50: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.platform.useradmin.store.cassandra.service;
+package org.amdatu.core.useradmin.store.cassandra.service;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition;
-import
org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.ColumnType;
-import
org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.CompareType;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
+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;
/**
* This service only provides the Role Column Family. Note that the
CassandraStorageProvider has
Modified:
trunk/amdatu-core/wink-application/src/main/java/org/amdatu/core/wink/osgi/Activator.java
==============================================================================
---
trunk/amdatu-core/wink-application/src/main/java/org/amdatu/core/wink/osgi/Activator.java
(original)
+++
trunk/amdatu-core/wink-application/src/main/java/org/amdatu/core/wink/osgi/Activator.java
Wed Nov 10 08:50:06 2010
@@ -15,10 +15,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.platform.wink.osgi;
+package org.amdatu.core.wink.osgi;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.wink.service.WinkRegistrationServiceImpl;
+import org.amdatu.core.wink.service.WinkRegistrationServiceImpl;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-core/wink-application/src/main/java/org/amdatu/core/wink/service/WinkRegistrationServiceImpl.java
==============================================================================
---
trunk/amdatu-core/wink-application/src/main/java/org/amdatu/core/wink/service/WinkRegistrationServiceImpl.java
(original)
+++
trunk/amdatu-core/wink-application/src/main/java/org/amdatu/core/wink/service/WinkRegistrationServiceImpl.java
Wed Nov 10 08:50: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.platform.wink.service;
+package org.amdatu.core.wink.service;
-import static org.amdatu.platform.wink.osgi.Activator.RESOURCE_ID;
+import static org.amdatu.core.wink.osgi.Activator.RESOURCE_ID;
import java.net.URL;
import java.util.ArrayList;
Modified:
trunk/amdatu-core/wink-application/src/main/java/org/amdatu/core/wink/service/WinkRestServlet.java
==============================================================================
---
trunk/amdatu-core/wink-application/src/main/java/org/amdatu/core/wink/service/WinkRestServlet.java
(original)
+++
trunk/amdatu-core/wink-application/src/main/java/org/amdatu/core/wink/service/WinkRestServlet.java
Wed Nov 10 08:50: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.platform.wink.service;
+package org.amdatu.core.wink.service;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
Modified:
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseOntologyDataProvider.java
==============================================================================
---
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseOntologyDataProvider.java
(original)
+++
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseOntologyDataProvider.java
Wed Nov 10 08:50:06 2010
@@ -26,7 +26,7 @@
import java.util.Map;
import org.amdatu.example.courseservice.CourseService;
-import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
+import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
import org.amdatu.semanticweb.sesame.SPARQLQueryHandler;
import org.amdatu.semanticweb.sesame.SesameService;
import org.openrdf.model.URI;
Modified:
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseResource.java
==============================================================================
---
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseResource.java
(original)
+++
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseResource.java
Wed Nov 10 08:50:06 2010
@@ -34,7 +34,7 @@
import org.amdatu.example.courseservice.CourseList;
import org.amdatu.example.courseservice.CourseService;
import org.amdatu.authorization.loginservice.AuthorizationService;
-import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
+import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.opensocial.profile.PersonService;
Modified:
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/osgi/Activator.java
==============================================================================
---
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/osgi/Activator.java
(original)
+++
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/osgi/Activator.java
Wed Nov 10 08:50:06 2010
@@ -21,7 +21,7 @@
import org.amdatu.example.courseservice.impl.CourseResource;
import org.amdatu.example.courseservice.impl.CourseServiceImpl;
import org.amdatu.example.courseservice.impl.ProfileDataProvider;
-import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
+import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.opensocial.profile.PersonService;
Modified:
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
==============================================================================
---
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
Wed Nov 10 08:50:06 2010
@@ -18,8 +18,8 @@
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import
org.amdatu.opensocial.gadgetmanagement.service.GadgetManagementServiceImpl;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyAvailable;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.core.cassandra.listener.ColumnFamilyAvailable;
+import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.opensocial.shindig.GadgetStore;
Modified:
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
Wed Nov 10 08:50:06 2010
@@ -46,7 +46,7 @@
import org.amdatu.opensocial.gadgetmanagement.osgi.Activator;
import org.amdatu.libraries.utilities.ConversionUtil;
import org.amdatu.authorization.loginservice.AuthorizationService;
-import org.amdatu.platform.cassandra.persistencemanager.CassandraException;
+import org.amdatu.core.cassandra.persistencemanager.CassandraException;
import org.amdatu.web.httpcontext.BasicHttpSession;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
Modified:
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/PersonService.java
==============================================================================
---
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/PersonService.java
(original)
+++
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/PersonService.java
Wed Nov 10 08:50:06 2010
@@ -34,12 +34,12 @@
/**
* The key under which OpenSocial persons are stored in the properties of
the User.
*/
- String OPEN_SOCIAL_PERSON_PROPERTIES_KEY =
"org.amdatu.platform.opensocial.person";
+ String OPEN_SOCIAL_PERSON_PROPERTIES_KEY =
"org.amdatu.core.opensocial.person";
/**
* The key under which OpenSocial friends are stored in the properties of
the User.
*/
- String OPEN_SOCIAL_FRIENDS_PROPERTIES_KEY =
"org.amdatu.platform.opensocial.person.friends";
+ String OPEN_SOCIAL_FRIENDS_PROPERTIES_KEY =
"org.amdatu.core.opensocial.person.friends";
/**
* Returns a list of all persons contained by this tenant aware person
service instance.
Modified:
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/osgi/Activator.java
==============================================================================
---
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/osgi/Activator.java
Wed Nov 10 08:50:06 2010
@@ -16,8 +16,8 @@
*/
package org.amdatu.opensocial.profile.osgi;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyAvailable;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider;
+import org.amdatu.core.cassandra.listener.ColumnFamilyAvailable;
+import org.amdatu.core.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-service/src/main/java/org/amdatu/opensocial/profile/service/FriendColumnFamilyProvider.java
==============================================================================
---
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/service/FriendColumnFamilyProvider.java
(original)
+++
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/service/FriendColumnFamilyProvider.java
Wed Nov 10 08:50:06 2010
@@ -16,10 +16,10 @@
*/
package org.amdatu.opensocial.profile.service;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition;
-import
org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.ColumnType;
-import
org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.CompareType;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider;
+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;
/**
* Provides the "Friend" ColumnFamily.
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
==============================================================================
---
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
Wed Nov 10 08:50:06 2010
@@ -18,7 +18,7 @@
import java.util.Map;
-import org.amdatu.platform.cassandra.persistencemanager.CassandraException;
+import org.amdatu.core.cassandra.persistencemanager.CassandraException;
import org.apache.shindig.gadgets.oauth.BasicOAuthStoreConsumerKeyAndSecret;
public interface GadgetStore {
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
==============================================================================
---
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
Wed Nov 10 08:50:06 2010
@@ -16,9 +16,9 @@
*/
package org.amdatu.opensocial.shindig.osgi;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyAvailable;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.core.cassandra.listener.ColumnFamilyAvailable;
+import org.amdatu.core.cassandra.listener.ColumnFamilyProvider;
+import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.opensocial.shindig.GadgetStore;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetColumnFamilyProvider.java
==============================================================================
---
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetColumnFamilyProvider.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetColumnFamilyProvider.java
Wed Nov 10 08:50:06 2010
@@ -16,11 +16,11 @@
*/
package org.amdatu.opensocial.shindig.persistence;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition;
-import
org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.ColumnType;
-import
org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.CompareType;
-import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
+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.opensocial.shindig.GadgetStore;
/**
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetStoreImpl.java
==============================================================================
---
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetStoreImpl.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetStoreImpl.java
Wed Nov 10 08:50:06 2010
@@ -26,8 +26,8 @@
import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.amdatu.platform.cassandra.persistencemanager.CassandraException;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.core.cassandra.persistencemanager.CassandraException;
+import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
import org.amdatu.opensocial.shindig.GadgetCategory;
import org.amdatu.opensocial.shindig.GadgetDefinition;
import org.amdatu.opensocial.shindig.GadgetStore;
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 10 08:50:06 2010
@@ -255,7 +255,7 @@
protected File integrationTestJarFile() {
FileFilter ff = new FileFilter() {
public boolean accept(File pathname) {
- return
pathname.getName().startsWith("org.amdatu.platform.integration-tests-")
+ return
pathname.getName().startsWith("org.amdatu.core.integration-tests-")
&& pathname.getName().endsWith(".jar")
&& !pathname.getName().endsWith("-javadoc.jar")
&& !pathname.getName().endsWith("-sources.jar");
@@ -268,35 +268,35 @@
// A load of Pax Exam definitions for easier (typo-free) provisioning
protected static MavenArtifactProvisionOption amdatuWink() {
- return
mavenBundle().groupId("org.amdatu.platform").artifactId("wink-application").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.core").artifactId("wink-application").versionAsInProject();
}
protected static MavenArtifactProvisionOption
amdatuUserAdminCassandraStore() {
- return
mavenBundle().groupId("org.amdatu.platform").artifactId("useradmin-cassandra-store").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.core").artifactId("useradmin-cassandra-store").versionAsInProject();
}
protected static MavenArtifactProvisionOption amdatuTenantService() {
- return
mavenBundle().groupId("org.amdatu.platform").artifactId("tenant-service").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.core").artifactId("tenant-service").versionAsInProject();
}
protected static MavenArtifactProvisionOption
amdatuCassandraPersistenceManager() {
- return
mavenBundle().groupId("org.amdatu.platform").artifactId("cassandra-persistencemanager").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.core").artifactId("cassandra-persistencemanager").versionAsInProject();
}
protected static MavenArtifactProvisionOption amdatuCassandraListener() {
- return
mavenBundle().groupId("org.amdatu.platform").artifactId("cassandra-listener").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.core").artifactId("cassandra-listener").versionAsInProject();
}
protected static MavenArtifactProvisionOption amdatuCassandraApplication()
{
- return
mavenBundle().groupId("org.amdatu.platform").artifactId("cassandra-application").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.core").artifactId("cassandra-application").versionAsInProject();
}
protected static MavenArtifactProvisionOption
amdatuConfigTemplateManager() {
- return
mavenBundle().groupId("org.amdatu.platform").artifactId("config-template-manager").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.core").artifactId("config-template-manager").versionAsInProject();
}
protected static MavenArtifactProvisionOption amdatuLogHandler() {
- return
mavenBundle().groupId("org.amdatu.platform").artifactId("loghandler").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.core").artifactId("loghandler").versionAsInProject();
}
protected static MavenArtifactProvisionOption amdatuHttpContext() {
@@ -304,7 +304,7 @@
}
protected static MavenArtifactProvisionOption fileBasedConfiguration() {
- return
mavenBundle().groupId("org.amdatu.platform").artifactId("filebased-configuration").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.core").artifactId("filebased-configuration").versionAsInProject();
}
protected static MavenArtifactProvisionOption felixScr() {
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/mock/InMemoryTenantStorageProvider.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/mock/InMemoryTenantStorageProvider.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/mock/InMemoryTenantStorageProvider.java
Wed Nov 10 08:50:06 2010
@@ -21,8 +21,8 @@
import java.util.List;
import java.util.Map;
-import org.amdatu.platform.tenant.TenantEntity;
-import org.amdatu.platform.tenant.TenantStorageProvider;
+import org.amdatu.core.tenant.TenantEntity;
+import org.amdatu.core.tenant.TenantStorageProvider;
/**
* This service provides an in-memory implementation of the
TenantStorageProvider, used for unit testing.
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 10 08:50:06 2010
@@ -20,12 +20,12 @@
import junit.framework.Assert;
-import org.amdatu.platform.cassandra.application.CassandraConfigurationService;
-import org.amdatu.platform.cassandra.application.CassandraDaemonService;
-import
org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.ColumnType;
-import
org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.CompareType;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
-import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
+import org.amdatu.core.cassandra.application.CassandraConfigurationService;
+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.core.configtemplatemanager.ConfigTemplateManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.test.integration.base.IntegrationTestBase;
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 10 08:50:06 2010
@@ -21,12 +21,12 @@
import junit.framework.Assert;
-import org.amdatu.platform.cassandra.application.CassandraDaemonService;
-import
org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.ColumnType;
-import
org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.CompareType;
-import org.amdatu.platform.cassandra.persistencemanager.CassandraException;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
-import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManagerFactory;
+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.test.integration.base.IntegrationTestBase;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/TenantManagementServiceTest.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/TenantManagementServiceTest.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/TenantManagementServiceTest.java
Wed Nov 10 08:50:06 2010
@@ -25,11 +25,11 @@
import junit.framework.Assert;
-import org.amdatu.platform.tenant.Tenant;
-import org.amdatu.platform.tenant.TenantEntity;
-import org.amdatu.platform.tenant.TenantException;
-import org.amdatu.platform.tenant.TenantManagementService;
-import org.amdatu.platform.tenant.TenantStorageProvider;
+import org.amdatu.core.tenant.Tenant;
+import org.amdatu.core.tenant.TenantEntity;
+import org.amdatu.core.tenant.TenantException;
+import org.amdatu.core.tenant.TenantManagementService;
+import org.amdatu.core.tenant.TenantStorageProvider;
import org.amdatu.test.integration.base.IntegrationTestBase;
import org.amdatu.test.integration.mock.InMemoryTenantStorageProvider;
import org.apache.felix.dm.Component;
