Author: [email protected]
Date: Tue Jul 26 18:04:48 2011
New Revision: 1229
Log:
AMDATU-401 Do not register as ManagedService when using DM
configurationDependency
Modified:
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivator.java
trunk/amdatu-core/useradminstore-fs/src/test/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivatorTest.java
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 Jul 26 18:04:48 2011
@@ -27,7 +27,6 @@
import org.ops4j.pax.useradmin.service.spi.StorageProvider;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
-import org.osgi.service.cm.ManagedService;
import org.osgi.service.log.LogService;
/**
@@ -40,7 +39,7 @@
manager.add(
createComponent()
.setImplementation(FSUserAdminStorageConfigImpl.class)
- .setInterface(new
String[]{FSUserAdminStorageConfig.class.getName(),
ManagedService.class.getName()}, null)
+ .setInterface(FSUserAdminStorageConfig.class.getName(), null)
.add(createConfigurationDependency()
.setPid(FSUserAdminStorageConfigImpl.CONFIGURATION_PID).setPropagate(true)));
Modified:
trunk/amdatu-core/useradminstore-fs/src/test/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivatorTest.java
==============================================================================
---
trunk/amdatu-core/useradminstore-fs/src/test/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivatorTest.java
(original)
+++
trunk/amdatu-core/useradminstore-fs/src/test/java/org/amdatu/core/useradminstore/fs/osgi/FSUserAdminStorageProviderActivatorTest.java
Tue Jul 26 18:04:48 2011
@@ -15,42 +15,41 @@
*/
package org.amdatu.core.useradminstore.fs.osgi;
-import java.io.File;
-import java.util.Collection;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Random;
-
-import junit.framework.Assert;
-
-import org.amdatu.core.tenant.Tenant;
-import org.amdatu.core.useradminstore.fs.service.FSUserAdminStorageConfig;
-import org.amdatu.core.useradminstore.fs.service.FSUserAdminStorageConfigImpl;
-import org.amdatu.core.useradminstore.fs.service.FSUserAdminStorageProvider;
-import org.amdatu.core.useradminstore.fs.service.mock.MockUserAdminFactory;
-import org.apache.felix.dm.ComponentDeclaration;
-import org.apache.felix.dm.DependencyActivatorBase;
-import org.hamcrest.Description;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.api.Action;
-import org.jmock.api.Invocation;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-import org.ops4j.pax.useradmin.service.spi.StorageProvider;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.Filter;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.cm.ManagedService;
-import org.osgi.service.log.LogService;
+import java.io.File;
+import java.util.Collection;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Random;
+
+import junit.framework.Assert;
+
+import org.amdatu.core.tenant.Tenant;
+import org.amdatu.core.useradminstore.fs.service.FSUserAdminStorageConfig;
+import org.amdatu.core.useradminstore.fs.service.FSUserAdminStorageConfigImpl;
+import org.amdatu.core.useradminstore.fs.service.FSUserAdminStorageProvider;
+import org.amdatu.core.useradminstore.fs.service.mock.MockUserAdminFactory;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.hamcrest.Description;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.api.Action;
+import org.jmock.api.Invocation;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+import org.ops4j.pax.useradmin.service.spi.StorageProvider;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Filter;
+import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.cm.ManagedService;
+import org.osgi.service.log.LogService;
public final class FSUserAdminStorageProviderActivatorTest {
@@ -170,7 +169,7 @@
will(addRegisteredService());
// assert that the FSUserAdminStorageConfig is registered and
store it for callback
- one(bundleContext).registerService(with(new String[] {
FSUserAdminStorageConfig.class.getName(), ManagedService.class.getName() }),
+
one(bundleContext).registerService(with(FSUserAdminStorageConfig.class.getName()),
with(aNonNull(FSUserAdminStorageConfigImpl.class)),
with(any(Dictionary.class)));
will(addRegisteredService());
}
@@ -184,7 +183,6 @@
Dictionary<String, String> dict = new Hashtable<String, String>();
dict.put(FSUserAdminStorageConfigImpl.DATA_DIRECTORY,
bundleStorageDir.getAbsolutePath());
((ManagedService) m_registeredServices.get(0)).updated(dict);
- ((ManagedService) m_registeredServices.get(2)).updated(dict);
// invoke the storage provider to get it persist something
StorageProvider provider = (StorageProvider)
m_registeredServices.get(1);
@@ -198,7 +196,7 @@
mockContext.assertIsSatisfied();
}
- @Test
+ @Test
public void testActivatorUsesRelativeStorageDirectory() throws Exception {
final Mockery mockContext = new Mockery();
@@ -289,7 +287,7 @@
will(addRegisteredService());
// assert that the FSUserAdminStorageConfig is registered and
store it for callback
- one(bundleContext).registerService(with(new String[] {
FSUserAdminStorageConfig.class.getName(), ManagedService.class.getName() }),
+
one(bundleContext).registerService(with(FSUserAdminStorageConfig.class.getName()),
with(aNonNull(FSUserAdminStorageConfigImpl.class)),
with(any(Dictionary.class)));
will(addRegisteredService());
}
@@ -304,7 +302,6 @@
Dictionary<String, String> dict = new Hashtable<String, String>();
dict.put(FSUserAdminStorageConfigImpl.DATA_DIRECTORY,
relativeStorageDirectoryPath);
((ManagedService) m_registeredServices.get(0)).updated(dict);
- ((ManagedService) m_registeredServices.get(2)).updated(dict);
// invoke the storage provider to get it persist something
StorageProvider provider = (StorageProvider)
m_registeredServices.get(1);
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
