svn commit: r1841891 [2/3] - in /aries/trunk/cdi/cdi-itests: ./ bnd/ src/main/java/org/apache/aries/cdi/test/cases/ src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/ src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/ src/main/java/org/apache/ari...

[ro...@apache.org]

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/Test152_3_1_1.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/Test152_3_1_1.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/Test152_3_1_1.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/Test152_3_1_1.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,1629 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.cdi.test.cases;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.Arrays;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+
+import org.apache.aries.cdi.test.interfaces.Pojo;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceObjects;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.util.promise.Deferred;
+import org.osgi.util.promise.Success;
+import org.osgi.util.tracker.ServiceTracker;
+
+public class Test152_3_1_1 extends AbstractTestCase {
+
+	@BeforeClass
+	public static void beforeClass() throws Exception {
+	}
+
+	@AfterClass
+	public static void afterClass() throws Exception {
+	}
+
+	@Override
+	public void setUp() throws Exception {
+		adminTracker = new ServiceTracker<>(bundleContext, ConfigurationAdmin.class, null);
+		adminTracker.open();
+		configurationAdmin = adminTracker.getService();
+	}
+
+	@After
+	@Override
+	public void tearDown() throws Exception {
+		adminTracker.close();
+	}
+
+	@SuppressWarnings({ "rawtypes", "serial", "unchecked" })
+	@Test
+	public void prototypeFactory() throws Exception {
+		AtomicReference<Deferred<Object[]>> a = new AtomicReference<>(new Deferred<>());
+		AtomicReference<Deferred<Object[]>> b = new AtomicReference<>(new Deferred<>());
+		AtomicReference<Deferred<Object[]>> c = new AtomicReference<>(new Deferred<>());
+
+		Consumer<Object[]> onInitialized = (o) -> a.get().resolve(o);
+		Consumer<Object[]> onBeforeDestroyed = (o) -> b.get().resolve(o);
+		Consumer<Object[]> onDestroyed = (o) -> c.get().resolve(o);
+
+		ServiceRegistration<Consumer> onInitializedReg = bundleContext.registerService(
+			Consumer.class, onInitialized,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onInitialized");}});
+
+		ServiceRegistration<Consumer> onBeforeDestroyedReg = bundleContext.registerService(
+			Consumer.class, onBeforeDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onBeforeDestroyed");}});
+
+		ServiceRegistration<Consumer> onDestroyedReg = bundleContext.registerService(
+			Consumer.class, onDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onDestroyed");}});
+
+		Bundle tbBundle = installBundle("tb152_3_1_1l.jar");
+		Configuration configuration = null;
+
+		try {
+			getBeanManager(tbBundle);
+
+			Success<Object[], Object[]> assertFailed = s -> {
+				fail("shouldn't have have succeeded");
+				return s;
+			};
+
+			a.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			try (CloseableTracker<Object, ServiceReference<Object>> tracker = trackSR("(objectClass=%s)", Pojo.class.getName())) {
+				assertThat(tracker.waitForService(50)).isNull();
+
+				// we didn't do a "get" yet so this should fail
+				a.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+				configuration = configurationAdmin.getConfiguration("prototypeFactory", "?");
+				configuration.update(new Hashtable() {{put("foo", "bar");}});
+
+				// should only work with single configuration instances
+				assertThat(tracker.waitForService(50)).isNull();
+
+				configuration.delete();
+
+				configuration = configurationAdmin.getFactoryConfiguration("prototypeFactory", "one", "?");
+				configuration.update(new Hashtable() {{put("foo", "bar");}});
+
+				assertThat(tracker.waitForService(50)).isNotNull();
+
+				// we still didn't do a "get" so this should still fail
+				a.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+				ServiceObjects<Object> serviceObjects = bundleContext.getServiceObjects(tracker.getService());
+
+				Object service = serviceObjects.getService();
+				assertThat(service).isNotNull();
+
+				a.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(service).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeFactory")
+						).contains(
+							entry("service.factoryPid", "prototypeFactory")
+						).contains(
+							entry(Constants.SERVICE_PID, Arrays.asList("prototypeFactory~one"))
+						).contains(
+							entry("foo", "bar")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+				b.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+				c.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+				a.set(new Deferred<>());
+
+				Object other = serviceObjects.getService();
+				assertThat(other).isNotNull();
+
+				a.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(other).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeFactory")
+						).contains(
+							entry("service.factoryPid", "prototypeFactory")
+						).contains(
+							entry(Constants.SERVICE_PID, Arrays.asList("prototypeFactory~one"))
+						).contains(
+							entry("foo", "bar")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+				b.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+				c.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+				assertThat(service).isNotEqualTo(other);
+
+				serviceObjects.ungetService(service);
+
+				b.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(service).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeFactory")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+
+				c.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(service).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeFactory")
+						).contains(
+							entry("service.factoryPid", "prototypeFactory")
+						).contains(
+							entry(Constants.SERVICE_PID, Arrays.asList("prototypeFactory~one"))
+						).contains(
+							entry("foo", "bar")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+
+				b.set(new Deferred<>());
+				c.set(new Deferred<>());
+
+				configuration.delete();
+
+				b.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(other).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeFactory")
+						).contains(
+							entry("service.factoryPid", "prototypeFactory")
+						).contains(
+							entry(Constants.SERVICE_PID, Arrays.asList("prototypeFactory~one"))
+						).contains(
+							entry("foo", "bar")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+
+				c.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(other).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeFactory")
+						).contains(
+							entry("service.factoryPid", "prototypeFactory")
+						).contains(
+							entry(Constants.SERVICE_PID, Arrays.asList("prototypeFactory~one"))
+						).contains(
+							entry("foo", "bar")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+			}
+		}
+		finally {
+			if (configuration != null) {
+				try {
+					configuration.delete();
+				}
+				catch (Exception e) {
+					// ignore
+				}
+			}
+			try {
+				tbBundle.uninstall();
+			}
+			finally {
+				onInitializedReg.unregister();
+				onBeforeDestroyedReg.unregister();
+				onDestroyedReg.unregister();
+			}
+		}
+	}
+
+	@SuppressWarnings({ "rawtypes", "serial", "unchecked" })
+	@Test
+	public void prototypeSingle_C() throws Exception {
+		AtomicReference<Deferred<Object[]>> a = new AtomicReference<>(new Deferred<>());
+		AtomicReference<Deferred<Object[]>> b = new AtomicReference<>(new Deferred<>());
+		AtomicReference<Deferred<Object[]>> c = new AtomicReference<>(new Deferred<>());
+
+		Consumer<Object[]> onInitialized = (o) -> a.get().resolve(o);
+		Consumer<Object[]> onBeforeDestroyed = (o) -> b.get().resolve(o);
+		Consumer<Object[]> onDestroyed = (o) -> c.get().resolve(o);
+
+		ServiceRegistration<Consumer> onInitializedReg = bundleContext.registerService(
+			Consumer.class, onInitialized,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onInitialized");}});
+
+		ServiceRegistration<Consumer> onBeforeDestroyedReg = bundleContext.registerService(
+			Consumer.class, onBeforeDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onBeforeDestroyed");}});
+
+		ServiceRegistration<Consumer> onDestroyedReg = bundleContext.registerService(
+			Consumer.class, onDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onDestroyed");}});
+
+		Bundle tbBundle = installBundle("tb152_3_1_1k.jar");
+		Configuration configuration = null;
+
+		try {
+			getBeanManager(tbBundle);
+
+			Success<Object[], Object[]> assertFailed = s -> {
+				fail("shouldn't have have succeeded");
+				return s;
+			};
+
+			a.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			try (CloseableTracker<Object, ServiceReference<Object>> tracker = trackSR("(objectClass=%s)", Pojo.class.getName())) {
+				assertThat(tracker.waitForService(50)).isNull();
+
+				// we didn't do a "get" yet so this should fail
+				a.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+				configuration = configurationAdmin.getConfiguration("prototypeSingle_C", "?");
+				configuration.update(new Hashtable() {{put("foo", "bar");}});
+
+				assertThat(tracker.waitForService(50)).isNotNull();
+
+				// we still didn't do a "get" so this should still fail
+				a.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+				ServiceObjects<Object> serviceObjects = bundleContext.getServiceObjects(tracker.getService());
+
+				Object service = serviceObjects.getService();
+				assertThat(service).isNotNull();
+
+				a.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(service).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeSingle_C")
+						).contains(
+							entry("foo", "bar")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+				b.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+				c.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+				a.set(new Deferred<>());
+
+				Object other = serviceObjects.getService();
+				assertThat(other).isNotNull();
+
+				a.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(other).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeSingle_C")
+						).contains(
+							entry("foo", "bar")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+				b.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+				c.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+				assertThat(service).isNotEqualTo(other);
+
+				serviceObjects.ungetService(service);
+
+				b.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(service).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeSingle_C")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+
+				c.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(service).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeSingle_C")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+
+				b.set(new Deferred<>());
+				c.set(new Deferred<>());
+
+				configuration.delete();
+
+				b.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(other).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeSingle_C")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+
+				c.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(other).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeSingle_C")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+			}
+		}
+		finally {
+			if (configuration != null) {
+				try {
+					configuration.delete();
+				}
+				catch (Exception e) {
+					// ignore
+				}
+			}
+			try {
+				tbBundle.uninstall();
+			}
+			finally {
+				onInitializedReg.unregister();
+				onBeforeDestroyedReg.unregister();
+				onDestroyedReg.unregister();
+			}
+		}
+	}
+
+	@SuppressWarnings({ "rawtypes", "serial", "unchecked" })
+	@Test
+	public void prototypeSingle() throws Exception {
+		AtomicReference<Deferred<Object[]>> a = new AtomicReference<>(new Deferred<>());
+		AtomicReference<Deferred<Object[]>> b = new AtomicReference<>(new Deferred<>());
+		AtomicReference<Deferred<Object[]>> c = new AtomicReference<>(new Deferred<>());
+
+		Consumer<Object[]> onInitialized = (o) -> a.get().resolve(o);
+		Consumer<Object[]> onBeforeDestroyed = (o) -> b.get().resolve(o);
+		Consumer<Object[]> onDestroyed = (o) -> c.get().resolve(o);
+
+		ServiceRegistration<Consumer> onInitializedReg = bundleContext.registerService(
+			Consumer.class, onInitialized,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onInitialized");}});
+
+		ServiceRegistration<Consumer> onBeforeDestroyedReg = bundleContext.registerService(
+			Consumer.class, onBeforeDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onBeforeDestroyed");}});
+
+		ServiceRegistration<Consumer> onDestroyedReg = bundleContext.registerService(
+			Consumer.class, onDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onDestroyed");}});
+
+		Bundle tbBundle = installBundle("tb152_3_1_1j.jar");
+
+		try {
+			getBeanManager(tbBundle);
+
+			Success<Object[], Object[]> assertFailed = s -> {
+				fail("shouldn't have have succeeded");
+				return s;
+			};
+
+			a.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			try (CloseableTracker<Object, ServiceReference<Object>> tracker = trackSR("(objectClass=%s)", Pojo.class.getName())) {
+				assertThat(tracker.waitForService(50)).isNotNull();
+
+				// we didn't do a "get" yet
+				a.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+				ServiceObjects<Object> serviceObjects = bundleContext.getServiceObjects(tracker.getService());
+
+				Object service = serviceObjects.getService();
+				assertThat(service).isNotNull();
+
+				a.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(service).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeSingle")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+				b.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+				c.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+				a.set(new Deferred<>());
+
+				Object other = serviceObjects.getService();
+				assertThat(other).isNotNull();
+
+				a.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(other).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeSingle")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+				b.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+				c.get().getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+				assertThat(service).isNotEqualTo(other);
+
+				serviceObjects.ungetService(service);
+
+				b.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(service).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeSingle")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+
+				c.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(service).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeSingle")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+
+				b.set(new Deferred<>());
+				c.set(new Deferred<>());
+
+				serviceObjects.ungetService(other);
+
+				b.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(other).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeSingle")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+
+				c.get().getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat(other).isEqualTo(values[0]);
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "prototypeSingle")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+			}
+		}
+		finally {
+			try {
+				tbBundle.uninstall();
+			}
+			finally {
+				onInitializedReg.unregister();
+				onBeforeDestroyedReg.unregister();
+				onDestroyedReg.unregister();
+			}
+		}
+	}
+
+	@SuppressWarnings({ "rawtypes", "serial", "unchecked" })
+	@Test
+	public void bundleFactory() throws Exception {
+		Deferred<Object[]> a = new Deferred<>();
+		Deferred<Object[]> b = new Deferred<>();
+		Deferred<Object[]> c = new Deferred<>();
+
+		Consumer<Object[]> onInitialized = (o) -> a.resolve(o);
+		Consumer<Object[]> onBeforeDestroyed = (o) -> b.resolve(o);
+		Consumer<Object[]> onDestroyed = (o) -> c.resolve(o);
+
+		ServiceRegistration<Consumer> onInitializedReg = bundleContext.registerService(
+			Consumer.class, onInitialized,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onInitialized");}});
+
+		ServiceRegistration<Consumer> onBeforeDestroyedReg = bundleContext.registerService(
+			Consumer.class, onBeforeDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onBeforeDestroyed");}});
+
+		ServiceRegistration<Consumer> onDestroyedReg = bundleContext.registerService(
+			Consumer.class, onDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onDestroyed");}});
+
+		Bundle tbBundle = installBundle("tb152_3_1_1i.jar");
+		Configuration configuration = null;
+
+		try {
+			getBeanManager(tbBundle);
+
+			Success<Object[], Object[]> assertFailed = s -> {
+				fail("shouldn't have have succeeded");
+				return s;
+			};
+
+			a.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			configuration = configurationAdmin.getConfiguration("bundleFactory", "?");
+			configuration.update(new Hashtable() {{put("foo", "bar");}});
+
+			// only accept factory configuration instances
+			try (CloseableTracker<Object, Object> tracker = track("(objectClass=%s)", Pojo.class.getName())) {
+				assertThat(tracker.waitForService(50)).isNull();
+			}
+
+			a.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			configuration.delete();
+
+			configuration = configurationAdmin.getFactoryConfiguration("bundleFactory", "one", "?");
+			configuration.update(new Hashtable() {{put("foo", "bar");}});
+
+			// Even with configuration, there's still no instance until a "get" is performed
+			a.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			try (CloseableTracker<Object, Object> tracker = track("(objectClass=%s)", Pojo.class.getName())) {
+				assertThat(tracker.waitForService(50)).isNotNull();
+			}
+
+			Success<Object[], Object[]> assertSucceeded = s -> {
+				Object[] values = s.getValue();
+
+				assertThat((Map<String, Object>)values[1]).contains(
+					entry("component.name", "bundleFactory")
+				).contains(
+					entry("service.factoryPid", "bundleFactory")
+				).contains(
+					entry(Constants.SERVICE_PID, Arrays.asList("bundleFactory~one"))
+				).contains(
+					entry("foo", "bar")
+				);
+
+				return s;
+			};
+
+			a.getPromise().timeout(timeout).then(
+				assertSucceeded,
+				f -> fail(f.toString())
+			).getValue();
+
+			b.getPromise().timeout(timeout).then(assertFailed).getFailure();
+			c.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			// this must terminate all bundle instances
+			configuration.delete();
+
+			b.getPromise().timeout(timeout).then(
+				s -> {
+					Object[] values = s.getValue();
+
+					assertThat((Map<String, Object>)values[1]).contains(
+						entry("component.name", "bundleFactory")
+					).contains(
+						entry("service.factoryPid", "bundleFactory")
+					).contains(
+						entry(Constants.SERVICE_PID, Arrays.asList("bundleFactory~one"))
+					).contains(
+						entry("foo", "bar")
+					);
+
+					try (CloseableTracker<Object, Object> tracker = track("(objectClass=%s)", Pojo.class.getName())) {
+						assertThat(tracker.waitForService(50)).isNull();
+					}
+
+					return s;
+				},
+				f -> fail(f.toString())
+			).getValue();
+			c.getPromise().timeout(timeout).then(
+				s -> {
+					Object[] values = s.getValue();
+
+					assertThat((Map<String, Object>)values[1]).contains(
+						entry("component.name", "bundleFactory")
+					).contains(
+						entry("service.factoryPid", "bundleFactory")
+					).contains(
+						entry(Constants.SERVICE_PID, Arrays.asList("bundleFactory~one"))
+					).contains(
+						entry("foo", "bar")
+					);
+
+					return s;
+				},
+				f -> fail(f.toString())
+			).getValue();
+		}
+		finally {
+			if (configuration != null) {
+				try {
+					configuration.delete();
+				}
+				catch (Exception e) {
+					// ignore
+				}
+			}
+			try {
+				tbBundle.uninstall();
+			}
+			finally {
+				onInitializedReg.unregister();
+				onBeforeDestroyedReg.unregister();
+				onDestroyedReg.unregister();
+			}
+		}
+	}
+
+	@SuppressWarnings({ "rawtypes", "serial", "unchecked" })
+	@Test
+	public void bundleSingle_C() throws Exception {
+		Deferred<Object[]> a = new Deferred<>();
+		Deferred<Object[]> b = new Deferred<>();
+		Deferred<Object[]> c = new Deferred<>();
+
+		Consumer<Object[]> onInitialized = (o) -> a.resolve(o);
+		Consumer<Object[]> onBeforeDestroyed = (o) -> b.resolve(o);
+		Consumer<Object[]> onDestroyed = (o) -> c.resolve(o);
+
+		ServiceRegistration<Consumer> onInitializedReg = bundleContext.registerService(
+			Consumer.class, onInitialized,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onInitialized");}});
+
+		ServiceRegistration<Consumer> onBeforeDestroyedReg = bundleContext.registerService(
+			Consumer.class, onBeforeDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onBeforeDestroyed");}});
+
+		ServiceRegistration<Consumer> onDestroyedReg = bundleContext.registerService(
+			Consumer.class, onDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onDestroyed");}});
+
+		Bundle tbBundle = installBundle("tb152_3_1_1h.jar");
+		Configuration configuration = null;
+
+		try {
+			getBeanManager(tbBundle);
+
+			Success<Object[], Object[]> assertFailed = s -> {
+				fail("shouldn't have have succeeded");
+				return s;
+			};
+
+			a.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			configuration = configurationAdmin.getConfiguration("bundleSingle_C", "?");
+			configuration.update(new Hashtable() {{put("foo", "bar");}});
+
+			a.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			try (CloseableTracker<Object, Object> tracker = track("(objectClass=%s)", Pojo.class.getName())) {
+				assertThat(tracker.waitForService(50)).isNotNull();
+			}
+
+			Success<Object[], Object[]> assertSucceeded = s -> {
+				Object[] values = s.getValue();
+
+				assertThat((Map<String, Object>)values[1]).contains(
+					entry("component.name", "bundleSingle_C")
+				).contains(
+					entry(Constants.SERVICE_PID, Arrays.asList("bundleSingle_C"))
+				).contains(
+					entry("foo", "bar")
+				);
+
+				return s;
+			};
+
+			a.getPromise().timeout(timeout).then(
+				assertSucceeded,
+				f -> fail(f.toString())
+			).getValue();
+
+			b.getPromise().timeout(timeout).then(assertFailed).getFailure();
+			c.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			configuration.delete();
+
+			b.getPromise().timeout(timeout).then(
+				s -> {
+					Object[] values = s.getValue();
+
+					assertThat((Map<String, Object>)values[1]).contains(
+						entry("component.name", "bundleSingle_C")
+					).contains(
+						entry(Constants.SERVICE_PID, Arrays.asList("bundleSingle_C"))
+					).contains(
+						entry("foo", "bar")
+					);
+
+					try (CloseableTracker<Object, Object> tracker = track("(objectClass=%s)", Pojo.class.getName())) {
+						assertThat(tracker.waitForService(50)).isNull();
+					}
+
+					return s;
+				},
+				f -> fail(f.toString())
+			).getValue();
+			c.getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "bundleSingle_C")
+						).contains(
+							entry(Constants.SERVICE_PID, Arrays.asList("bundleSingle_C"))
+						).contains(
+							entry("foo", "bar")
+						);
+
+						return s;
+					},
+				f -> fail(f.toString())
+			).getValue();
+		}
+		finally {
+			if (configuration != null) {
+				try {
+					configuration.delete();
+				}
+				catch (Exception e) {
+					// ignore
+				}
+			}
+			try {
+				tbBundle.uninstall();
+			}
+			finally {
+				onInitializedReg.unregister();
+				onBeforeDestroyedReg.unregister();
+				onDestroyedReg.unregister();
+			}
+		}
+	}
+
+	@SuppressWarnings({ "rawtypes", "serial", "unchecked" })
+	@Test
+	public void bundleSingle() throws Exception {
+		Deferred<Object[]> a = new Deferred<>();
+		Deferred<Object[]> b = new Deferred<>();
+		Deferred<Object[]> c = new Deferred<>();
+
+		Consumer<Object[]> onInitialized = (o) -> a.resolve(o);
+		Consumer<Object[]> onBeforeDestroyed = (o) -> b.resolve(o);
+		Consumer<Object[]> onDestroyed = (o) -> c.resolve(o);
+
+		ServiceRegistration<Consumer> onInitializedReg = bundleContext.registerService(
+			Consumer.class, onInitialized,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onInitialized");}});
+
+		ServiceRegistration<Consumer> onBeforeDestroyedReg = bundleContext.registerService(
+			Consumer.class, onBeforeDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onBeforeDestroyed");}});
+
+		ServiceRegistration<Consumer> onDestroyedReg = bundleContext.registerService(
+			Consumer.class, onDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onDestroyed");}});
+
+		Bundle tbBundle = installBundle("tb152_3_1_1g.jar");
+
+		try {
+			getBeanManager(tbBundle);
+
+			Success<Object[], Object[]> assertFailed = s -> {
+				fail("shouldn't have have succeeded");
+				return s;
+			};
+
+			a.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			try (CloseableTracker<Object, Object> tracker = track("(objectClass=%s)", Pojo.class.getName())) {
+				assertThat(tracker.waitForService(50)).isNotNull();
+			}
+
+			a.getPromise().timeout(timeout).then(
+				s -> {
+					Object[] values = s.getValue();
+
+					assertThat((Map<String, Object>)values[1]).contains(
+						entry("component.name", "bundleSingle")
+					);
+
+					return s;
+				},
+				f -> fail(f.toString())
+			).getValue();
+		}
+		finally {
+			try {
+				tbBundle.uninstall();
+
+				try (CloseableTracker<Object, Object> tracker = track("(objectClass=%s)", Pojo.class.getName())) {
+					assertThat(tracker.waitForService(50)).isNull();
+				}
+
+				b.getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "bundleSingle")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+
+				c.getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "bundleSingle")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+			}
+			finally {
+				onInitializedReg.unregister();
+				onBeforeDestroyedReg.unregister();
+				onDestroyedReg.unregister();
+			}
+		}
+	}
+
+	@SuppressWarnings({ "rawtypes", "serial", "unchecked" })
+	@Test
+	public void singletonFactory() throws Exception {
+		Deferred<Object[]> a = new Deferred<>();
+		Deferred<Object[]> b = new Deferred<>();
+		Deferred<Object[]> c = new Deferred<>();
+
+		Consumer<Object[]> onInitialized = (o) -> a.resolve(o);
+		Consumer<Object[]> onBeforeDestroyed = (o) -> b.resolve(o);
+		Consumer<Object[]> onDestroyed = (o) -> c.resolve(o);
+
+		ServiceRegistration<Consumer> onInitializedReg = bundleContext.registerService(
+			Consumer.class, onInitialized,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onInitialized");}});
+
+		ServiceRegistration<Consumer> onBeforeDestroyedReg = bundleContext.registerService(
+			Consumer.class, onBeforeDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onBeforeDestroyed");}});
+
+		ServiceRegistration<Consumer> onDestroyedReg = bundleContext.registerService(
+			Consumer.class, onDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onDestroyed");}});
+
+		Bundle tbBundle = installBundle("tb152_3_1_1f.jar");
+		Configuration configuration = null;
+
+		try {
+			getBeanManager(tbBundle);
+
+			Success<Object[], Object[]> assertFailed = s -> {
+				fail("shouldn't have have succeeded");
+				return s;
+			};
+
+			a.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			configuration = configurationAdmin.getConfiguration("singletonFactory", "?");
+			configuration.update(new Hashtable() {{put("foo", "bar");}});
+
+			// only accept factory configuration instances
+			a.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			configuration.delete();
+
+			configuration = configurationAdmin.getFactoryConfiguration("singletonFactory", "one", "?");
+			configuration.update(new Hashtable() {{put("foo", "bar");}});
+
+			Success<Object[], Object[]> assertSucceeded = s -> {
+				Object[] values = s.getValue();
+
+				assertThat((Map<String, Object>)values[1]).contains(
+					entry("component.name", "singletonFactory")
+				).contains(
+					entry("service.factoryPid", "singletonFactory")
+				).contains(
+					entry(Constants.SERVICE_PID, Arrays.asList("singletonFactory~one"))
+				).contains(
+					entry("foo", "bar")
+				);
+
+				try (CloseableTracker<Object, Object> tracker = track("(objectClass=%s)", Pojo.class.getName())) {
+					assertThat(tracker.waitForService(50)).isNotNull();
+				}
+
+				return s;
+			};
+
+			a.getPromise().timeout(timeout).then(
+				assertSucceeded,
+				f -> fail(f.toString())
+			).getValue();
+
+			b.getPromise().timeout(timeout).then(assertFailed).getFailure();
+			c.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			configuration.delete();
+
+			b.getPromise().timeout(timeout).then(
+				s -> {
+					Object[] values = s.getValue();
+
+					assertThat((Map<String, Object>)values[1]).contains(
+						entry("component.name", "singletonFactory")
+					).contains(
+						entry("service.factoryPid", "singletonFactory")
+					).contains(
+						entry(Constants.SERVICE_PID, Arrays.asList("singletonFactory~one"))
+					).contains(
+						entry("foo", "bar")
+					);
+
+					try (CloseableTracker<Object, Object> tracker = track("(objectClass=%s)", Pojo.class.getName())) {
+						assertThat(tracker.waitForService(50)).isNull();
+					}
+
+					return s;
+				},
+				f -> fail(f.toString())
+			).getValue();
+			c.getPromise().timeout(timeout).then(
+				s -> {
+					Object[] values = s.getValue();
+
+					assertThat((Map<String, Object>)values[1]).contains(
+						entry("component.name", "singletonFactory")
+					).contains(
+						entry("service.factoryPid", "singletonFactory")
+					).contains(
+						entry(Constants.SERVICE_PID, Arrays.asList("singletonFactory~one"))
+					).contains(
+						entry("foo", "bar")
+					);
+
+					return s;
+				},
+				f -> fail(f.toString())
+			).getValue();
+		}
+		finally {
+			if (configuration != null) {
+				try {
+					configuration.delete();
+				}
+				catch (Exception e) {
+					// ignore
+				}
+			}
+			try {
+				tbBundle.uninstall();
+
+			}
+			finally {
+				onInitializedReg.unregister();
+				onBeforeDestroyedReg.unregister();
+				onDestroyedReg.unregister();
+			}
+		}
+	}
+
+	@SuppressWarnings({ "rawtypes", "serial", "unchecked" })
+	@Test
+	public void singletonSingle_C() throws Exception {
+		Deferred<Object[]> a = new Deferred<>();
+		Deferred<Object[]> b = new Deferred<>();
+		Deferred<Object[]> c = new Deferred<>();
+
+		Consumer<Object[]> onInitialized = (o) -> a.resolve(o);
+		Consumer<Object[]> onBeforeDestroyed = (o) -> b.resolve(o);
+		Consumer<Object[]> onDestroyed = (o) -> c.resolve(o);
+
+		ServiceRegistration<Consumer> onInitializedReg = bundleContext.registerService(
+			Consumer.class, onInitialized,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onInitialized");}});
+
+		ServiceRegistration<Consumer> onBeforeDestroyedReg = bundleContext.registerService(
+			Consumer.class, onBeforeDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onBeforeDestroyed");}});
+
+		ServiceRegistration<Consumer> onDestroyedReg = bundleContext.registerService(
+			Consumer.class, onDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onDestroyed");}});
+
+		Bundle tbBundle = installBundle("tb152_3_1_1e.jar");
+		Configuration configuration = null;
+
+		try {
+			getBeanManager(tbBundle);
+
+			Success<Object[], Object[]> assertFailed = s -> {
+				fail("shouldn't have have succeeded");
+				return s;
+			};
+
+			a.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			configuration = configurationAdmin.getConfiguration("singletonSingle_C", "?");
+			configuration.update(new Hashtable() {{put("foo", "bar");}});
+
+			Success<Object[], Object[]> assertSucceeded = s -> {
+				Object[] values = s.getValue();
+
+				assertThat((Map<String, Object>)values[1]).contains(
+					entry("component.name", "singletonSingle_C")
+				).contains(
+					entry(Constants.SERVICE_PID, Arrays.asList("singletonSingle_C"))
+				).contains(
+					entry("foo", "bar")
+				);
+
+				try (CloseableTracker<Object, Object> tracker = track("(objectClass=%s)", Pojo.class.getName())) {
+					assertThat(tracker.waitForService(50)).isNotNull();
+				}
+
+				return s;
+			};
+
+			a.getPromise().timeout(timeout).then(
+				assertSucceeded,
+				f -> fail(f.toString())
+			).getValue();
+
+			b.getPromise().timeout(timeout).then(assertFailed).getFailure();
+			c.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			configuration.delete();
+
+			b.getPromise().timeout(timeout).then(
+				s -> {
+					Object[] values = s.getValue();
+
+					assertThat((Map<String, Object>)values[1]).contains(
+						entry("component.name", "singletonSingle_C")
+					).contains(
+						entry(Constants.SERVICE_PID, Arrays.asList("singletonSingle_C"))
+					).contains(
+						entry("foo", "bar")
+					);
+
+					try (CloseableTracker<Object, Object> tracker = track("(objectClass=%s)", Pojo.class.getName())) {
+						assertThat(tracker.waitForService(50)).isNull();
+					}
+
+					return s;
+				},
+				f -> fail(f.toString())
+			).getValue();
+			c.getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "singletonSingle_C")
+						).contains(
+							entry(Constants.SERVICE_PID, Arrays.asList("singletonSingle_C"))
+						).contains(
+							entry("foo", "bar")
+						);
+
+						return s;
+					},
+				f -> fail(f.toString())
+			).getValue();
+		}
+		finally {
+			if (configuration != null) {
+				try {
+					configuration.delete();
+				}
+				catch (Exception e) {
+					// ignore
+				}
+			}
+			try {
+				tbBundle.uninstall();
+			}
+			finally {
+				onInitializedReg.unregister();
+				onBeforeDestroyedReg.unregister();
+				onDestroyedReg.unregister();
+			}
+		}
+	}
+
+	@SuppressWarnings({ "rawtypes", "serial", "unchecked" })
+	@Test
+	public void singletonSingle() throws Exception {
+		Deferred<Object[]> a = new Deferred<>();
+		Deferred<Object[]> b = new Deferred<>();
+		Deferred<Object[]> c = new Deferred<>();
+
+		Consumer<Object[]> onInitialized = (o) -> a.resolve(o);
+		Consumer<Object[]> onBeforeDestroyed = (o) -> b.resolve(o);
+		Consumer<Object[]> onDestroyed = (o) -> c.resolve(o);
+
+		ServiceRegistration<Consumer> onInitializedReg = bundleContext.registerService(
+			Consumer.class, onInitialized,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onInitialized");}});
+
+		ServiceRegistration<Consumer> onBeforeDestroyedReg = bundleContext.registerService(
+			Consumer.class, onBeforeDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onBeforeDestroyed");}});
+
+		ServiceRegistration<Consumer> onDestroyedReg = bundleContext.registerService(
+			Consumer.class, onDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onDestroyed");}});
+
+		Bundle tbBundle = installBundle("tb152_3_1_1d.jar");
+
+		try {
+			getBeanManager(tbBundle);
+
+			a.getPromise().timeout(timeout).then(
+				s -> {
+					Object[] values = s.getValue();
+
+					assertThat((Map<String, Object>)values[1]).contains(
+						entry("component.name", "singletonSingle")
+					);
+
+					try (CloseableTracker<Object, Object> tracker = track("(objectClass=%s)", Pojo.class.getName())) {
+						assertThat(tracker.waitForService(50)).isNotNull();
+					}
+
+					return s;
+				},
+				f -> fail(f.toString())
+			).getValue();
+		}
+		finally {
+			try {
+				tbBundle.uninstall();
+
+				b.getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "singletonSingle")
+						);
+
+						try (CloseableTracker<Object, Object> tracker = track("(objectClass=%s)", Pojo.class.getName())) {
+							assertThat(tracker.waitForService(50)).isNull();
+						}
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+
+				c.getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "singletonSingle")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+			}
+			finally {
+				onInitializedReg.unregister();
+				onBeforeDestroyedReg.unregister();
+				onDestroyedReg.unregister();
+			}
+		}
+	}
+
+	@SuppressWarnings({ "rawtypes", "serial", "unchecked" })
+	@Test
+	public void immediateFactory() throws Exception {
+		Deferred<Object[]> a = new Deferred<>();
+		Deferred<Object[]> b = new Deferred<>();
+		Deferred<Object[]> c = new Deferred<>();
+
+		Consumer<Object[]> onInitialized = (o) -> a.resolve(o);
+		Consumer<Object[]> onBeforeDestroyed = (o) -> b.resolve(o);
+		Consumer<Object[]> onDestroyed = (o) -> c.resolve(o);
+
+		ServiceRegistration<Consumer> onInitializedReg = bundleContext.registerService(
+			Consumer.class, onInitialized,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onInitialized");}});
+
+		ServiceRegistration<Consumer> onBeforeDestroyedReg = bundleContext.registerService(
+			Consumer.class, onBeforeDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onBeforeDestroyed");}});
+
+		ServiceRegistration<Consumer> onDestroyedReg = bundleContext.registerService(
+			Consumer.class, onDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onDestroyed");}});
+
+		Bundle tbBundle = installBundle("tb152_3_1_1c.jar");
+		Configuration configuration = null;
+
+		try {
+			getBeanManager(tbBundle);
+
+			Success<Object[], Object[]> assertFailed = s -> {
+				fail("shouldn't have have succeeded");
+				return s;
+			};
+
+			a.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			configuration = configurationAdmin.getConfiguration("immediateFactory", "?");
+			configuration.update(new Hashtable() {{put("foo", "bar");}});
+
+			// only accept factory configuration instances
+			a.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			configuration.delete();
+
+			configuration = configurationAdmin.getFactoryConfiguration("immediateFactory", "one", "?");
+			configuration.update(new Hashtable() {{put("foo", "bar");}});
+
+			Success<Object[], Object[]> assertSucceeded = s -> {
+				Object[] values = s.getValue();
+
+				assertThat((Map<String, Object>)values[1]).contains(
+					entry("component.name", "immediateFactory")
+				).contains(
+					entry("service.factoryPid", "immediateFactory")
+				).contains(
+					entry(Constants.SERVICE_PID, Arrays.asList("immediateFactory~one"))
+				).contains(
+					entry("foo", "bar")
+				);
+
+				try (CloseableTracker<Object, Object> tracker = track("(objectClass=%s)", Pojo.class.getName())) {
+					assertThat(tracker.waitForService(50)).isNull();
+				}
+
+				return s;
+			};
+
+			a.getPromise().timeout(timeout).then(
+				assertSucceeded,
+				f -> fail(f.toString())
+			).getValue();
+
+			b.getPromise().timeout(timeout).then(assertFailed).getFailure();
+			c.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			configuration.delete();
+
+			b.getPromise().timeout(timeout).then(
+				assertSucceeded,
+				f -> fail(f.toString())
+			).getValue();
+			c.getPromise().timeout(timeout).then(
+				assertSucceeded,
+				f -> fail(f.toString())
+			).getValue();
+		}
+		finally {
+			if (configuration != null) {
+				try {
+					configuration.delete();
+				}
+				catch (Exception e) {
+					// ignore
+				}
+			}
+			try {
+				tbBundle.uninstall();
+
+			}
+			finally {
+				onInitializedReg.unregister();
+				onBeforeDestroyedReg.unregister();
+				onDestroyedReg.unregister();
+			}
+		}
+	}
+
+	@SuppressWarnings({ "rawtypes", "serial", "unchecked" })
+	@Test
+	public void immediateSingle_C() throws Exception {
+		Deferred<Object[]> a = new Deferred<>();
+		Deferred<Object[]> b = new Deferred<>();
+		Deferred<Object[]> c = new Deferred<>();
+
+		Consumer<Object[]> onInitialized = (o) -> a.resolve(o);
+		Consumer<Object[]> onBeforeDestroyed = (o) -> b.resolve(o);
+		Consumer<Object[]> onDestroyed = (o) -> c.resolve(o);
+
+		ServiceRegistration<Consumer> onInitializedReg = bundleContext.registerService(
+			Consumer.class, onInitialized,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onInitialized");}});
+
+		ServiceRegistration<Consumer> onBeforeDestroyedReg = bundleContext.registerService(
+			Consumer.class, onBeforeDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onBeforeDestroyed");}});
+
+		ServiceRegistration<Consumer> onDestroyedReg = bundleContext.registerService(
+			Consumer.class, onDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onDestroyed");}});
+
+		Bundle tbBundle = installBundle("tb152_3_1_1b.jar");
+		Configuration configuration = null;
+
+		try {
+			getBeanManager(tbBundle);
+
+			Success<Object[], Object[]> assertFailed = s -> {
+				fail("shouldn't have have succeeded");
+				return s;
+			};
+
+			a.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			configuration = configurationAdmin.getConfiguration("immediateSingle_C", "?");
+			configuration.update(new Hashtable() {{put("foo", "bar");}});
+
+			Success<Object[], Object[]> assertSucceeded = s -> {
+				Object[] values = s.getValue();
+
+				assertThat((Map<String, Object>)values[1]).contains(
+					entry("component.name", "immediateSingle_C")
+				).contains(
+					entry(Constants.SERVICE_PID, Arrays.asList("immediateSingle_C"))
+				).contains(
+					entry("foo", "bar")
+				);
+
+				try (CloseableTracker<Object, Object> tracker = track("(objectClass=%s)", Pojo.class.getName())) {
+					assertThat(tracker.waitForService(50)).isNull();
+				}
+
+				return s;
+			};
+
+			a.getPromise().timeout(timeout).then(
+				assertSucceeded,
+				f -> fail(f.toString())
+			).getValue();
+
+			b.getPromise().timeout(timeout).then(assertFailed).getFailure();
+			c.getPromise().timeout(timeout).then(assertFailed).getFailure();
+
+			configuration.delete();
+
+			b.getPromise().timeout(timeout).then(
+				assertSucceeded,
+				f -> fail(f.toString())
+			).getValue();
+			c.getPromise().timeout(timeout).then(
+				assertSucceeded,
+				f -> fail(f.toString())
+			).getValue();
+		}
+		finally {
+			if (configuration != null) {
+				try {
+					configuration.delete();
+				}
+				catch (Exception e) {
+					// ignore
+				}
+			}
+			try {
+				tbBundle.uninstall();
+
+			}
+			finally {
+				onInitializedReg.unregister();
+				onBeforeDestroyedReg.unregister();
+				onDestroyedReg.unregister();
+			}
+		}
+	}
+
+	@SuppressWarnings({ "rawtypes", "serial", "unchecked" })
+	@Test
+	public void immediateSingle() throws Exception {
+		Deferred<Object[]> a = new Deferred<>();
+		Deferred<Object[]> b = new Deferred<>();
+		Deferred<Object[]> c = new Deferred<>();
+
+		Consumer<Object[]> onInitialized = (o) -> a.resolve(o);
+		Consumer<Object[]> onBeforeDestroyed = (o) -> b.resolve(o);
+		Consumer<Object[]> onDestroyed = (o) -> c.resolve(o);
+
+		ServiceRegistration<Consumer> onInitializedReg = bundleContext.registerService(
+			Consumer.class, onInitialized,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onInitialized");}});
+
+		ServiceRegistration<Consumer> onBeforeDestroyedReg = bundleContext.registerService(
+			Consumer.class, onBeforeDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onBeforeDestroyed");}});
+
+		ServiceRegistration<Consumer> onDestroyedReg = bundleContext.registerService(
+			Consumer.class, onDestroyed,
+			new Hashtable() {{put(Constants.SERVICE_DESCRIPTION, "onDestroyed");}});
+
+		Bundle tbBundle = installBundle("tb152_3_1_1a.jar");
+
+		try {
+			getBeanManager(tbBundle);
+
+			a.getPromise().timeout(timeout).then(
+				s -> {
+					Object[] values = s.getValue();
+
+					assertThat((Map<String, Object>)values[1]).contains(
+						entry("component.name", "immediateSingle")
+					);
+
+					try (CloseableTracker<Object, Object> tracker = track("(objectClass=%s)", Pojo.class.getName())) {
+						assertThat(tracker.waitForService(50)).isNull();
+					}
+
+					return s;
+				},
+				f -> fail(f.toString())
+			).getValue();
+		}
+		finally {
+			try {
+				tbBundle.uninstall();
+
+				b.getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "immediateSingle")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+
+				c.getPromise().timeout(timeout).then(
+					s -> {
+						Object[] values = s.getValue();
+
+						assertThat((Map<String, Object>)values[1]).contains(
+							entry("component.name", "immediateSingle")
+						);
+
+						return s;
+					},
+					f -> fail(f.toString())
+				).getValue();
+			}
+			finally {
+				onInitializedReg.unregister();
+				onBeforeDestroyedReg.unregister();
+				onDestroyedReg.unregister();
+			}
+		}
+	}
+
+	private ServiceTracker<ConfigurationAdmin, ConfigurationAdmin> adminTracker;
+	private ConfigurationAdmin configurationAdmin;
+
+}

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/ContextObserver.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/ContextObserver.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/ContextObserver.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/ContextObserver.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,73 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.cdi.test.tb152_3_1_1a;
+
+import java.util.Map;
+import java.util.function.Consumer;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.BeforeDestroyed;
+import javax.enterprise.context.Destroyed;
+import javax.enterprise.context.Initialized;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.EventMetadata;
+import javax.inject.Inject;
+
+import org.osgi.service.cdi.annotations.ComponentProperties;
+import org.osgi.service.cdi.annotations.ComponentScoped;
+import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.propertytypes.ServiceDescription;
+
+@ApplicationScoped
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class ContextObserver {
+
+	@Inject
+	public ContextObserver(
+		@Reference
+		@ServiceDescription("onInitialized")
+		Consumer onInitialized,
+		@Reference
+		@ServiceDescription("onBeforeDestroyed")
+		Consumer onBeforeDestroyed,
+		@Reference
+		@ServiceDescription("onDestroyed")
+		Consumer onDestroyed) {
+
+		this.onInitialized = onInitialized;
+		this.onBeforeDestroyed = onBeforeDestroyed;
+		this.onDestroyed = onDestroyed;
+	}
+
+	private final Consumer onInitialized;
+	private final Consumer onBeforeDestroyed;
+	private final Consumer onDestroyed;
+
+	void onInitialized(@Observes @Initialized(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onInitialized.accept(new Object[] { obj, properties, metadata });
+	}
+
+	void onBeforeDestroyed(@Observes @BeforeDestroyed(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onBeforeDestroyed.accept(new Object[] { obj, properties, metadata });
+	}
+
+	void onDestroyed(@Observes @Destroyed(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onDestroyed.accept(new Object[] { obj, properties, metadata });
+	}
+
+}

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/ImmediateSingle.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/ImmediateSingle.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/ImmediateSingle.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/ImmediateSingle.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,32 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.cdi.test.tb152_3_1_1a;
+
+import org.apache.aries.cdi.test.interfaces.Pojo;
+import org.osgi.service.cdi.annotations.SingleComponent;
+
+@SingleComponent
+public class ImmediateSingle implements Pojo {
+
+	@Override
+	public String foo(String fooInput) {
+		return null;
+	}
+
+	@Override
+	public int getCount() {
+		return 0;
+	}
+}

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/package-info.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/package-info.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/package-info.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/package-info.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,16 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+@org.osgi.service.cdi.annotations.Beans
+package org.apache.aries.cdi.test.tb152_3_1_1a;

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/ContextObserver.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/ContextObserver.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/ContextObserver.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/ContextObserver.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,73 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.cdi.test.tb152_3_1_1b;
+
+import java.util.Map;
+import java.util.function.Consumer;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.BeforeDestroyed;
+import javax.enterprise.context.Destroyed;
+import javax.enterprise.context.Initialized;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.EventMetadata;
+import javax.inject.Inject;
+
+import org.osgi.service.cdi.annotations.ComponentProperties;
+import org.osgi.service.cdi.annotations.ComponentScoped;
+import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.propertytypes.ServiceDescription;
+
+@ApplicationScoped
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class ContextObserver {
+
+	@Inject
+	public ContextObserver(
+		@Reference
+		@ServiceDescription("onInitialized")
+		Consumer onInitialized,
+		@Reference
+		@ServiceDescription("onBeforeDestroyed")
+		Consumer onBeforeDestroyed,
+		@Reference
+		@ServiceDescription("onDestroyed")
+		Consumer onDestroyed) {
+
+		this.onInitialized = onInitialized;
+		this.onBeforeDestroyed = onBeforeDestroyed;
+		this.onDestroyed = onDestroyed;
+	}
+
+	private final Consumer onInitialized;
+	private final Consumer onBeforeDestroyed;
+	private final Consumer onDestroyed;
+
+	void onInitialized(@Observes @Initialized(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onInitialized.accept(new Object[] { obj, properties, metadata });
+	}
+
+	void onBeforeDestroyed(@Observes @BeforeDestroyed(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onBeforeDestroyed.accept(new Object[] { obj, properties, metadata });
+	}
+
+	void onDestroyed(@Observes @Destroyed(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onDestroyed.accept(new Object[] { obj, properties, metadata });
+	}
+
+}

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/ImmediateSingle_C.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/ImmediateSingle_C.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/ImmediateSingle_C.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/ImmediateSingle_C.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,36 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.cdi.test.tb152_3_1_1b;
+
+import org.apache.aries.cdi.test.interfaces.Pojo;
+import org.osgi.service.cdi.CDIConstants;
+import org.osgi.service.cdi.ConfigurationPolicy;
+import org.osgi.service.cdi.annotations.PID;
+import org.osgi.service.cdi.annotations.SingleComponent;
+
+@PID(value = CDIConstants.CDI_COMPONENT_NAME, policy = ConfigurationPolicy.REQUIRED)
+@SingleComponent
+public class ImmediateSingle_C implements Pojo {
+
+	@Override
+	public String foo(String fooInput) {
+		return null;
+	}
+
+	@Override
+	public int getCount() {
+		return 0;
+	}
+}

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/package-info.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/package-info.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/package-info.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/package-info.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,16 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+@org.osgi.service.cdi.annotations.Beans
+package org.apache.aries.cdi.test.tb152_3_1_1b;

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1c/ContextObserver.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1c/ContextObserver.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1c/ContextObserver.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1c/ContextObserver.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,73 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.cdi.test.tb152_3_1_1c;
+
+import java.util.Map;
+import java.util.function.Consumer;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.BeforeDestroyed;
+import javax.enterprise.context.Destroyed;
+import javax.enterprise.context.Initialized;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.EventMetadata;
+import javax.inject.Inject;
+
+import org.osgi.service.cdi.annotations.ComponentProperties;
+import org.osgi.service.cdi.annotations.ComponentScoped;
+import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.propertytypes.ServiceDescription;
+
+@ApplicationScoped
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class ContextObserver {
+
+	@Inject
+	public ContextObserver(
+		@Reference
+		@ServiceDescription("onInitialized")
+		Consumer onInitialized,
+		@Reference
+		@ServiceDescription("onBeforeDestroyed")
+		Consumer onBeforeDestroyed,
+		@Reference
+		@ServiceDescription("onDestroyed")
+		Consumer onDestroyed) {
+
+		this.onInitialized = onInitialized;
+		this.onBeforeDestroyed = onBeforeDestroyed;
+		this.onDestroyed = onDestroyed;
+	}
+
+	private final Consumer onInitialized;
+	private final Consumer onBeforeDestroyed;
+	private final Consumer onDestroyed;
+
+	void onInitialized(@Observes @Initialized(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onInitialized.accept(new Object[] { obj, properties, metadata });
+	}
+
+	void onBeforeDestroyed(@Observes @BeforeDestroyed(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onBeforeDestroyed.accept(new Object[] { obj, properties, metadata });
+	}
+
+	void onDestroyed(@Observes @Destroyed(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onDestroyed.accept(new Object[] { obj, properties, metadata });
+	}
+
+}

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1c/ImmediateFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1c/ImmediateFactory.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1c/ImmediateFactory.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1c/ImmediateFactory.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,32 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.cdi.test.tb152_3_1_1c;
+
+import org.apache.aries.cdi.test.interfaces.Pojo;
+import org.osgi.service.cdi.annotations.FactoryComponent;
+
+@FactoryComponent
+public class ImmediateFactory implements Pojo {
+
+	@Override
+	public String foo(String fooInput) {
+		return null;
+	}
+
+	@Override
+	public int getCount() {
+		return 0;
+	}
+}

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1c/package-info.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1c/package-info.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1c/package-info.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1c/package-info.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,16 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+@org.osgi.service.cdi.annotations.Beans
+package org.apache.aries.cdi.test.tb152_3_1_1c;

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1d/ContextObserver.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1d/ContextObserver.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1d/ContextObserver.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1d/ContextObserver.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,73 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.cdi.test.tb152_3_1_1d;
+
+import java.util.Map;
+import java.util.function.Consumer;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.BeforeDestroyed;
+import javax.enterprise.context.Destroyed;
+import javax.enterprise.context.Initialized;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.EventMetadata;
+import javax.inject.Inject;
+
+import org.osgi.service.cdi.annotations.ComponentProperties;
+import org.osgi.service.cdi.annotations.ComponentScoped;
+import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.propertytypes.ServiceDescription;
+
+@ApplicationScoped
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class ContextObserver {
+
+	@Inject
+	public ContextObserver(
+		@Reference
+		@ServiceDescription("onInitialized")
+		Consumer onInitialized,
+		@Reference
+		@ServiceDescription("onBeforeDestroyed")
+		Consumer onBeforeDestroyed,
+		@Reference
+		@ServiceDescription("onDestroyed")
+		Consumer onDestroyed) {
+
+		this.onInitialized = onInitialized;
+		this.onBeforeDestroyed = onBeforeDestroyed;
+		this.onDestroyed = onDestroyed;
+	}
+
+	private final Consumer onInitialized;
+	private final Consumer onBeforeDestroyed;
+	private final Consumer onDestroyed;
+
+	void onInitialized(@Observes @Initialized(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onInitialized.accept(new Object[] { obj, properties, metadata });
+	}
+
+	void onBeforeDestroyed(@Observes @BeforeDestroyed(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onBeforeDestroyed.accept(new Object[] { obj, properties, metadata });
+	}
+
+	void onDestroyed(@Observes @Destroyed(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onDestroyed.accept(new Object[] { obj, properties, metadata });
+	}
+
+}

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1d/SingletonSingle.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1d/SingletonSingle.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1d/SingletonSingle.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1d/SingletonSingle.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,34 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.cdi.test.tb152_3_1_1d;
+
+import org.apache.aries.cdi.test.interfaces.Pojo;
+import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.annotations.SingleComponent;
+
+@Service
+@SingleComponent
+public class SingletonSingle implements Pojo {
+
+	@Override
+	public String foo(String fooInput) {
+		return null;
+	}
+
+	@Override
+	public int getCount() {
+		return 0;
+	}
+}

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1d/package-info.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1d/package-info.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1d/package-info.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1d/package-info.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,16 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+@org.osgi.service.cdi.annotations.Beans
+package org.apache.aries.cdi.test.tb152_3_1_1d;

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1e/ContextObserver.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1e/ContextObserver.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1e/ContextObserver.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1e/ContextObserver.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,73 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.cdi.test.tb152_3_1_1e;
+
+import java.util.Map;
+import java.util.function.Consumer;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.BeforeDestroyed;
+import javax.enterprise.context.Destroyed;
+import javax.enterprise.context.Initialized;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.EventMetadata;
+import javax.inject.Inject;
+
+import org.osgi.service.cdi.annotations.ComponentProperties;
+import org.osgi.service.cdi.annotations.ComponentScoped;
+import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.propertytypes.ServiceDescription;
+
+@ApplicationScoped
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class ContextObserver {
+
+	@Inject
+	public ContextObserver(
+		@Reference
+		@ServiceDescription("onInitialized")
+		Consumer onInitialized,
+		@Reference
+		@ServiceDescription("onBeforeDestroyed")
+		Consumer onBeforeDestroyed,
+		@Reference
+		@ServiceDescription("onDestroyed")
+		Consumer onDestroyed) {
+
+		this.onInitialized = onInitialized;
+		this.onBeforeDestroyed = onBeforeDestroyed;
+		this.onDestroyed = onDestroyed;
+	}
+
+	private final Consumer onInitialized;
+	private final Consumer onBeforeDestroyed;
+	private final Consumer onDestroyed;
+
+	void onInitialized(@Observes @Initialized(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onInitialized.accept(new Object[] { obj, properties, metadata });
+	}
+
+	void onBeforeDestroyed(@Observes @BeforeDestroyed(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onBeforeDestroyed.accept(new Object[] { obj, properties, metadata });
+	}
+
+	void onDestroyed(@Observes @Destroyed(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onDestroyed.accept(new Object[] { obj, properties, metadata });
+	}
+
+}

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1e/SingletonSingle_C.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1e/SingletonSingle_C.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1e/SingletonSingle_C.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1e/SingletonSingle_C.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,38 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.cdi.test.tb152_3_1_1e;
+
+import org.apache.aries.cdi.test.interfaces.Pojo;
+import org.osgi.service.cdi.CDIConstants;
+import org.osgi.service.cdi.ConfigurationPolicy;
+import org.osgi.service.cdi.annotations.PID;
+import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.annotations.SingleComponent;
+
+@PID(value = CDIConstants.CDI_COMPONENT_NAME, policy = ConfigurationPolicy.REQUIRED)
+@Service
+@SingleComponent
+public class SingletonSingle_C implements Pojo {
+
+	@Override
+	public String foo(String fooInput) {
+		return null;
+	}
+
+	@Override
+	public int getCount() {
+		return 0;
+	}
+}

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1e/package-info.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1e/package-info.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1e/package-info.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1e/package-info.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,16 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+@org.osgi.service.cdi.annotations.Beans
+package org.apache.aries.cdi.test.tb152_3_1_1e;

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1f/ContextObserver.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1f/ContextObserver.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1f/ContextObserver.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1f/ContextObserver.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,73 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.cdi.test.tb152_3_1_1f;
+
+import java.util.Map;
+import java.util.function.Consumer;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.BeforeDestroyed;
+import javax.enterprise.context.Destroyed;
+import javax.enterprise.context.Initialized;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.EventMetadata;
+import javax.inject.Inject;
+
+import org.osgi.service.cdi.annotations.ComponentProperties;
+import org.osgi.service.cdi.annotations.ComponentScoped;
+import org.osgi.service.cdi.annotations.Reference;
+import org.osgi.service.cdi.propertytypes.ServiceDescription;
+
+@ApplicationScoped
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class ContextObserver {
+
+	@Inject
+	public ContextObserver(
+		@Reference
+		@ServiceDescription("onInitialized")
+		Consumer onInitialized,
+		@Reference
+		@ServiceDescription("onBeforeDestroyed")
+		Consumer onBeforeDestroyed,
+		@Reference
+		@ServiceDescription("onDestroyed")
+		Consumer onDestroyed) {
+
+		this.onInitialized = onInitialized;
+		this.onBeforeDestroyed = onBeforeDestroyed;
+		this.onDestroyed = onDestroyed;
+	}
+
+	private final Consumer onInitialized;
+	private final Consumer onBeforeDestroyed;
+	private final Consumer onDestroyed;
+
+	void onInitialized(@Observes @Initialized(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onInitialized.accept(new Object[] { obj, properties, metadata });
+	}
+
+	void onBeforeDestroyed(@Observes @BeforeDestroyed(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onBeforeDestroyed.accept(new Object[] { obj, properties, metadata });
+	}
+
+	void onDestroyed(@Observes @Destroyed(ComponentScoped.class) Object obj,
+			@ComponentProperties Map<String, Object> properties, EventMetadata metadata) {
+		onDestroyed.accept(new Object[] { obj, properties, metadata });
+	}
+
+}

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1f/SingletonFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1f/SingletonFactory.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1f/SingletonFactory.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1f/SingletonFactory.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,34 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.cdi.test.tb152_3_1_1f;
+
+import org.apache.aries.cdi.test.interfaces.Pojo;
+import org.osgi.service.cdi.annotations.FactoryComponent;
+import org.osgi.service.cdi.annotations.Service;
+
+@Service
+@FactoryComponent
+public class SingletonFactory implements Pojo {
+
+	@Override
+	public String foo(String fooInput) {
+		return null;
+	}
+
+	@Override
+	public int getCount() {
+		return 0;
+	}
+}

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1f/package-info.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1f/package-info.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1f/package-info.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1f/package-info.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,16 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+@org.osgi.service.cdi.annotations.Beans
+package org.apache.aries.cdi.test.tb152_3_1_1f;

Added: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1g/BundleSingle.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1g/BundleSingle.java?rev=1841891&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1g/BundleSingle.java (added)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1g/BundleSingle.java Mon Sep 24 20:24:11 2018
@@ -0,0 +1,38 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.cdi.test.tb152_3_1_1g;
+
+import static org.osgi.service.cdi.ServiceScope.*;
+
+import org.apache.aries.cdi.test.interfaces.Pojo;
+import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.annotations.ServiceInstance;
+import org.osgi.service.cdi.annotations.SingleComponent;
+
+@Service
+@ServiceInstance(BUNDLE)
+@SingleComponent
+public class BundleSingle implements Pojo {
+
+	@Override
+	public String foo(String fooInput) {
+		return null;
+	}
+
+	@Override
+	public int getCount() {
+		return 0;
+	}
+}