Author: [email protected]
Date: Tue Sep 20 17:23:18 2011
New Revision: 1403
Log:
AMDATU-417 LogService is now optional where appropriate, removed setInterface
calls from aspects as they don't need one.
Modified:
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/config/templates/osgi/Activator.java
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/osgi/Activator.java
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/osgi/Activator.java
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/osgi/FSTenantStorageProviderActivator.java
trunk/amdatu-core/tenantuseradmindecorator/src/main/java/org/amdatu/core/tenantuseradmindecorator/osgi/Activator.java
trunk/amdatu-core/useradmincache/src/main/java/org/amdatu/core/useradmincache/osgi/Activator.java
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivator.java
Modified:
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/config/templates/osgi/Activator.java
==============================================================================
---
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/config/templates/osgi/Activator.java
(original)
+++
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/config/templates/osgi/Activator.java
Tue Sep 20 17:23:18 2011
@@ -31,14 +31,17 @@
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
- // Create and register the Config Template Manager service
- manager.add(
- createComponent()
- .setInterface(ConfigTemplateManager.class.getName(), null)
- .setImplementation(ConfigTemplateManagerImpl.class)
-
.add(createServiceDependency().setService(LogService.class).setRequired(true))
-
.add(createServiceDependency().setService(ConfigurationAdmin.class).setRequired(true))
-
.add(createConfigurationDependency().setPid(ConfigTemplateManagerImpl.PID)));
+ manager.add(createComponent()
+ .setInterface(ConfigTemplateManager.class.getName(), null)
+ .setImplementation(ConfigTemplateManagerImpl.class)
+
.add(createConfigurationDependency().setPid(ConfigTemplateManagerImpl.PID))
+ .add(createServiceDependency()
+ .setService(ConfigurationAdmin.class)
+ .setRequired(true))
+ .add(createServiceDependency()
+ .setService(LogService.class)
+ .setRequired(false))
+ );
}
@Override
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
Tue Sep 20 17:23:18 2011
@@ -20,6 +20,7 @@
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.cm.ManagedService;
import org.osgi.service.log.LogListener;
import org.osgi.service.log.LogReaderService;
@@ -37,20 +38,25 @@
manager.add(createComponent()
.setInterface(new String[]{LogListener.class.getName(),
ManagedService.class.getName()}, null)
.setImplementation(ConsoleLogHandler.class)
+ .add(createConfigurationDependency()
+ .setPid(ConsoleLogHandler.PID))
.add(createServiceDependency()
.setService(LogReaderService.class)
.setRequired(false)
- .setCallbacks("logReaderAdded", "logReaderRemoved"))
-
.add(createConfigurationDependency().setPid(ConsoleLogHandler.PID)));
-
+ .setCallbacks("logReaderAdded", "logReaderRemoved"))
+ );
// Register the JDKLog bridge
manager.add(createComponent()
- .setImplementation(new JdkLogForwarder())
-
.add(createServiceDependency().setService(LogService.class).setRequired(true))
-
.add(createServiceDependency().setService("(objectclass=*)").setCallbacks("onAdded",
"onRemoved")));
-
- // TODO Why do we filter? Don't we just want all stuff?
+ .setImplementation(JdkLogForwarder.class)
+ .add(createServiceDependency()
+ .setService(LogService.class)
+ .setRequired(true))
+ .add(createServiceDependency()
+ .setService("(" + Constants.OBJECTCLASS + "=*)")
+ .setRequired(false)
+ .setCallbacks("onAdded", "onRemoved"))
+ );
}
@Override
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
Tue Sep 20 17:23:18 2011
@@ -37,26 +37,36 @@
// Create and register the Tenant management service
manager.add(
createComponent()
- .setImplementation(TenantManagementServiceImpl.class)
.setInterface(TenantManagementService.class.getName(), null)
-
.add(createServiceDependency().setService(TenantStorageProvider.class).setRequired(true))
-
.add(createServiceDependency().setService(LogService.class).setRequired(true)));
+ .setImplementation(TenantManagementServiceImpl.class)
+ .add(createServiceDependency()
+ .setService(TenantStorageProvider.class)
+ .setRequired(true))
+ .add(createServiceDependency()
+ .setService(LogService.class)
+ .setRequired(false))
+ );
- // Create and register the Cached Tenant management service
- String filter = "(" + Constants.OBJECTCLASS + "=" +
TenantManagementService.class.getName() + ")";
- manager.add(
- createAspectService(TenantManagementService.class, filter, 10,
null)
+ manager.add(createAspectService(TenantManagementService.class, "(" +
Constants.OBJECTCLASS + "=" + TenantManagementService.class.getName() + ")",
10, null)
+ .setInterface(TenantManagementService.class.getName(), null)
.setImplementation(TenantManagementCache.class)
- .setInterface(TenantManagementService.class.getName(), null)
-
.add(createServiceDependency().setService(LogService.class).setRequired(true)));
+ .add(createServiceDependency()
+ .setService(LogService.class)
+ .setRequired(false))
+ );
// Create and register the Tenant config service
- manager.add(
- createComponent()
+ manager.add(createComponent()
.setImplementation(TenantConfigServiceImpl.class)
-
.add(createServiceDependency().setService(LogService.class).setRequired(true).setInstanceBound(true))
-
.add(createServiceDependency().setService(TenantManagementService.class).setRequired(true))
-
.add(createConfigurationDependency().setPid(TenantManagementService.PID)));
+ .add(createConfigurationDependency()
+ .setPid(TenantManagementService.PID))
+ .add(createServiceDependency()
+ .setService(TenantManagementService.class)
+ .setRequired(true))
+ .add(createServiceDependency()
+ .setService(LogService.class)
+ .setRequired(false))
+ );
}
@Override
Modified:
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/osgi/FSTenantStorageProviderActivator.java
==============================================================================
---
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/osgi/FSTenantStorageProviderActivator.java
(original)
+++
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/osgi/FSTenantStorageProviderActivator.java
Tue Sep 20 17:23:18 2011
@@ -30,13 +30,16 @@
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
- manager.add(
- createComponent()
- .setImplementation(new FSTenantStorageProvider())
- .setInterface(TenantStorageProvider.class.getName(), null)
- .add(createConfigurationDependency()
-
.setPid(FSTenantStorageProvider.CONFIGURATION_PID).setPropagate(true))
-
.add(createServiceDependency().setService(LogService.class).setRequired(false)));
+ manager.add(createComponent()
+ .setInterface(TenantStorageProvider.class.getName(), null)
+ .setImplementation(new FSTenantStorageProvider())
+ .add(createConfigurationDependency()
+ .setPid(FSTenantStorageProvider.CONFIGURATION_PID)
+ .setPropagate(true))
+ .add(createServiceDependency()
+ .setService(LogService.class)
+ .setRequired(false))
+ );
}
@Override
Modified:
trunk/amdatu-core/tenantuseradmindecorator/src/main/java/org/amdatu/core/tenantuseradmindecorator/osgi/Activator.java
==============================================================================
---
trunk/amdatu-core/tenantuseradmindecorator/src/main/java/org/amdatu/core/tenantuseradmindecorator/osgi/Activator.java
(original)
+++
trunk/amdatu-core/tenantuseradmindecorator/src/main/java/org/amdatu/core/tenantuseradmindecorator/osgi/Activator.java
Tue Sep 20 17:23:18 2011
@@ -38,9 +38,13 @@
manager.add(
createAspectService(UserAdmin.class, filter, 30, null)
.setImplementation(TenantUserAdminDecorator.class)
- .setInterface(UserAdmin.class.getName(), null)
-
.add(createServiceDependency().setService(LogService.class).setRequired(true))
-
.add(createServiceDependency().setService(TenantManagementService.class).setRequired(true)));
+ .add(createServiceDependency()
+ .setService(TenantManagementService.class)
+ .setRequired(true))
+ .add(createServiceDependency()
+ .setService(LogService.class)
+ .setRequired(false))
+ );
}
public void destroy(BundleContext context, DependencyManager manager)
throws Exception {
Modified:
trunk/amdatu-core/useradmincache/src/main/java/org/amdatu/core/useradmincache/osgi/Activator.java
==============================================================================
---
trunk/amdatu-core/useradmincache/src/main/java/org/amdatu/core/useradmincache/osgi/Activator.java
(original)
+++
trunk/amdatu-core/useradmincache/src/main/java/org/amdatu/core/useradmincache/osgi/Activator.java
Tue Sep 20 17:23:18 2011
@@ -34,11 +34,12 @@
// Create and register the Tenant UserAdmin decorator service
//org.ops4j.pax.useradmin.storageprovider.type
String filter = "(" + Constants.OBJECTCLASS + "=" +
UserAdmin.class.getName() + ")";
- manager.add(
- createAspectService(UserAdmin.class, filter, 20, null)
+ manager.add(createAspectService(UserAdmin.class, filter, 20, null)
.setImplementation(UserAdminCache.class)
- .setInterface(UserAdmin.class.getName(), null)
-
.add(createServiceDependency().setService(LogService.class).setRequired(true)));
+ .add(createServiceDependency()
+ .setService(LogService.class)
+ .setRequired(false))
+ );
}
public void destroy(BundleContext context, DependencyManager manager)
throws Exception {
Modified:
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivator.java
==============================================================================
---
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivator.java
(original)
+++
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivator.java
Tue Sep 20 17:23:18 2011
@@ -15,9 +15,6 @@
*/
package org.amdatu.core.useradminstore.fs.osgi;
-import java.util.Dictionary;
-import java.util.Hashtable;
-
import org.amdatu.core.tenant.Tenant;
import org.amdatu.core.useradminstore.fs.service.FSUserAdminStorageConfig;
import org.amdatu.core.useradminstore.fs.service.FSUserAdminStorageConfigImpl;
@@ -26,7 +23,6 @@
import org.apache.felix.dm.DependencyManager;
import org.ops4j.pax.useradmin.service.spi.StorageProvider;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
import org.osgi.service.log.LogService;
/**
@@ -36,23 +32,26 @@
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
- manager.add(
- createComponent()
- .setImplementation(FSUserAdminStorageConfigImpl.class)
+ manager.add(createComponent()
.setInterface(FSUserAdminStorageConfig.class.getName(), null)
+ .setImplementation(FSUserAdminStorageConfigImpl.class)
.add(createConfigurationDependency()
-
.setPid(FSUserAdminStorageConfigImpl.CONFIGURATION_PID).setPropagate(true)));
+ .setPid(FSUserAdminStorageConfigImpl.CONFIGURATION_PID)
+ .setPropagate(true))
+ );
// We register the FS tenant store as an adapter service for tenant,
which makes it tenant aware.
// An instance of this store will be available for each tenant.
- Dictionary<String, Object> properties = new Hashtable<String,
Object>();
- properties.put(Constants.SERVICE_RANKING, 0);
- manager.add(
- createAdapterService(Tenant.class, null)
+ manager.add(createAdapterService(Tenant.class, null)
.setImplementation(FSUserAdminStorageProvider.class)
- .setInterface(StorageProvider.class.getName(), properties)
-
.add(createServiceDependency().setService(FSUserAdminStorageConfig.class).setRequired(true))
-
.add(createServiceDependency().setService(LogService.class).setRequired(false)));
+ .setInterface(StorageProvider.class.getName(), null)
+ .add(createServiceDependency()
+ .setService(FSUserAdminStorageConfig.class)
+ .setRequired(true))
+ .add(createServiceDependency()
+ .setService(LogService.class)
+ .setRequired(false))
+ );
}
@Override
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
