Author: [email protected]
Date: Thu Sep 22 11:15:38 2011
New Revision: 1407
Log:
AMDATU-415 Removed tenant cache / deprecated classes
Removed:
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/service/TenantManagementCache.java
Modified:
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantManagementService.java
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantStorageException.java
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantStorageProvider.java
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/osgi/Activator.java
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/service/TenantConfigServiceImpl.java
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/service/TenantManagementServiceImpl.java
Modified:
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantManagementService.java
==============================================================================
---
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantManagementService.java
(original)
+++
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantManagementService.java
Thu Sep 22 11:15:38 2011
@@ -22,7 +22,9 @@
* Interface of the tenant service. Responsible for managing tenants. Service
adapters
* are used to create tenant aware services. The tenant service will provide
tenants
* and the Felix dependency manager will automatically invoke a service
instance for
- * each tenant aware service in which the tenant is injected.
+ * each tenant aware service in which the tenant is injected.
+ *
+ * @deprecated Will be removed in a future release (see AMDATU-421)
*/
public interface TenantManagementService {
/**
Modified:
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantStorageException.java
==============================================================================
---
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantStorageException.java
(original)
+++
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantStorageException.java
Thu Sep 22 11:15:38 2011
@@ -17,6 +17,8 @@
/**
* This exception signifies a problem in reading or writing from/to the
persistent storage.
+ *
+ * @deprecated Will be removed in a future release (see AMDATU-421)
*/
public class TenantStorageException extends TenantException {
public TenantStorageException(Exception e) {
Modified:
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantStorageProvider.java
==============================================================================
---
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantStorageProvider.java
(original)
+++
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantStorageProvider.java
Thu Sep 22 11:15:38 2011
@@ -22,7 +22,9 @@
*
* The {@link TenantStorageProvider} can assume that synchronization will be
handled externally.
*
- * All methods are allowed to throw a {@link TenantStorageException} when
storage or retrieval fails.
+ * All methods are allowed to throw a {@link TenantStorageException} when
storage or retrieval fails.
+ *
+ * @deprecated Will be removed in a future release (see AMDATU-421)
*/
public interface TenantStorageProvider {
Modified:
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/osgi/Activator.java
==============================================================================
---
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/osgi/Activator.java
(original)
+++
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/osgi/Activator.java
Thu Sep 22 11:15:38 2011
@@ -18,18 +18,17 @@
import org.amdatu.core.tenant.TenantManagementService;
import org.amdatu.core.tenant.TenantStorageProvider;
import org.amdatu.core.tenant.service.TenantConfigServiceImpl;
-import org.amdatu.core.tenant.service.TenantManagementCache;
import org.amdatu.core.tenant.service.TenantManagementServiceImpl;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
import org.osgi.service.log.LogService;
/**
* This class represents the OSGi activator for the tenant service
+ *
* @author ivol
- *
+ *
*/
public class Activator extends DependencyActivatorBase {
@Override
@@ -37,36 +36,28 @@
// Create and register the Tenant management service
manager.add(
createComponent()
- .setInterface(TenantManagementService.class.getName(), null)
- .setImplementation(TenantManagementServiceImpl.class)
- .add(createServiceDependency()
- .setService(TenantStorageProvider.class)
- .setRequired(true))
- .add(createServiceDependency()
- .setService(LogService.class)
- .setRequired(false))
- );
-
- manager.add(createAspectService(TenantManagementService.class, "(" +
Constants.OBJECTCLASS + "=" + TenantManagementService.class.getName() + ")",
10, null)
- .setInterface(TenantManagementService.class.getName(), null)
- .setImplementation(TenantManagementCache.class)
- .add(createServiceDependency()
- .setService(LogService.class)
- .setRequired(false))
- );
+ .setInterface(TenantManagementService.class.getName(), null)
+ .setImplementation(TenantManagementServiceImpl.class)
+ .add(createServiceDependency()
+ .setService(TenantStorageProvider.class)
+ .setRequired(true))
+ .add(createServiceDependency()
+ .setService(LogService.class)
+ .setRequired(false))
+ );
// Create and register the Tenant config service
manager.add(createComponent()
.setImplementation(TenantConfigServiceImpl.class)
.add(createConfigurationDependency()
- .setPid(TenantManagementService.PID))
- .add(createServiceDependency()
- .setService(TenantManagementService.class)
- .setRequired(true))
+ .setPid(TenantManagementService.PID))
+ .add(createServiceDependency()
+ .setService(TenantManagementService.class)
+ .setRequired(true))
.add(createServiceDependency()
- .setService(LogService.class)
- .setRequired(false))
- );
+ .setService(LogService.class)
+ .setRequired(false))
+ );
}
@Override
Modified:
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/service/TenantConfigServiceImpl.java
==============================================================================
---
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/service/TenantConfigServiceImpl.java
(original)
+++
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/service/TenantConfigServiceImpl.java
Thu Sep 22 11:15:38 2011
@@ -36,8 +36,11 @@
* invoked will be the cache service, such that the cache will be refreshed
automatically when the
* tenant config has been changed.
*
- * @author ivol
+ * @author ivol
+ *
+ * @deprecated Will be removed in a future release (see AMDATU-421)
*/
+@Deprecated
public class TenantConfigServiceImpl implements ManagedService {
// Service dependencies injected by the dependency manager
private volatile LogService m_logService;
Modified:
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/service/TenantManagementServiceImpl.java
==============================================================================
---
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/service/TenantManagementServiceImpl.java
(original)
+++
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/service/TenantManagementServiceImpl.java
Thu Sep 22 11:15:38 2011
@@ -41,8 +41,11 @@
* is a managed service that depends on this config and will invoke this
service when new tenants are available,
* tenants have been removed or updated.
*
- * @author ivol
+ * @author ivol
+ *
+ * @deprecated This service will be removed in a future release (see
AMDATU-421)
*/
+@Deprecated
public class TenantManagementServiceImpl implements TenantManagementService {
private volatile LogService m_logService;
private volatile DependencyManager m_manager;
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
