pax exam 3.0.0 migration ...
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1532118 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/ExtraDependency1.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/ExtraDependency1.java
deleted file mode 100644
index b4720cb..0000000
--- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/ExtraDependency1.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.felix.dm.test.bundle.annotation.factory;
-
-import org.apache.felix.dm.annotation.api.Component;
-import org.apache.felix.dm.annotation.api.Property;
-
-@Component(properties = @Property(name = "foo", value = "bar"))
-public class ExtraDependency1 implements Runnable {
- public void run() {
- }
-}
diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/ExtraDependency2.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/ExtraDependency2.java
deleted file mode 100644
index 1dcdf31..0000000
--- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/ExtraDependency2.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.felix.dm.test.bundle.annotation.factory;
-
-import org.apache.felix.dm.annotation.api.Component;
-import org.apache.felix.dm.annotation.api.Property;
-
-@Component(properties = @Property(name = "foo", value = "bar2"))
-public class ExtraDependency2 implements Runnable {
- public void run() {
- System.out.println("ExtraDependency2.run()");
- }
-}
diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyService.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyService.java
deleted file mode 100644
index 29129c8..0000000
--- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyService.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.felix.dm.test.bundle.annotation.factory;
-
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.Assert;
-
-import org.apache.felix.dm.annotation.api.Component;
-import org.apache.felix.dm.annotation.api.Init;
-import org.apache.felix.dm.annotation.api.Property;
-import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.annotation.api.Stop;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
-
-/**
- * This service is instantiated using a "factory set" from the
- * ServiceFactoryAnnotationTest class.
- *
- * @see org.apache.felix.dm.test.annotation.ServiceFactoryAnnotationTest
- */
-@Component(factorySet = "MyServiceFactory", factoryConfigure = "configure", properties = { @Property(name = "foo", value = "bar") })
-public class MyService implements MyServiceInterface {
- /**
- * The configuration provided by MyServiceFactory
- */
- @SuppressWarnings("unchecked")
- Dictionary m_configuration;
-
- /**
- * Our sequencer.
- */
- @ServiceDependency
- Sequencer m_sequencer;
-
- /**
- * An extra dependency (we'll dynamically configure the filter from our
- * init() method).
- */
- @ServiceDependency(name = "extra")
- Runnable m_extra;
-
- /**
- * This is the first method called: we are provided with the
- * MyServiceFactory configuration.
- */
- public void configure(Dictionary<?, ?> configuration) {
- if (m_configuration == null) {
- m_configuration = configuration;
- } else {
- m_sequencer.step(5);
- }
- }
-
- /**
- * Initialize our Service: we'll dynamically configure our dependency whose
- * name is "extra".
- */
- @Init
- Map init() {
- return new HashMap() {
- {
- put("extra.filter", "(foo=bar2)");
- put("extra.required", "true");
- }
- };
- }
-
- /**
- * our Service is starting: at this point, all required dependencies have
- * been injected.
- */
- @Start
- public void start() {
- Assert.assertNotNull("Extra dependency not injected", m_extra);
- m_extra.run();
- m_sequencer.step(2);
- }
-
- /**
- * Our service is stopping.
- */
- @Stop
- public void stop() {
- m_sequencer.step(10);
- }
-
- public void added(String instanceId) {
- if (instanceId.equals(m_configuration.get("instance.id"))) {
- m_sequencer.step(4);
- }
- }
-
- public void changed(String modified) {
- if (modified.equals(m_configuration.get("instance.modified"))) {
- m_sequencer.step(7);
- }
- }
-
- public void removed() {
- m_sequencer.step(9);
- }
-}
diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyServiceClient.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyServiceClient.java
deleted file mode 100644
index 3727feb..0000000
--- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyServiceClient.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.felix.dm.test.bundle.annotation.factory;
-
-import java.util.Map;
-
-import junit.framework.Assert;
-
-import org.apache.felix.dm.annotation.api.Component;
-import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
-
-@Component
-public class MyServiceClient {
- @ServiceDependency
- Sequencer m_sequencer;
-
- @Start
- void start() {
- m_sequencer.step(1);
- }
-
- @ServiceDependency(required = false, changed = "update", removed = "removed")
- void bind(Map serviceProperties, MyServiceInterface service) {
- m_sequencer.step(3);
- Assert.assertEquals("bar", serviceProperties.get("foo"));
- Assert.assertNull(serviceProperties.get(".private.param"));
- service.added((String) serviceProperties.get("instance.id"));
- }
-
- void update(Map serviceProperties, MyServiceInterface service) {
- m_sequencer.step(6);
- service.changed((String) serviceProperties.get("instance.modified"));
- }
-
- void removed(MyServiceInterface service) {
- m_sequencer.step(8);
- service.removed();
- }
-}
diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyServiceInterface.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyServiceInterface.java
deleted file mode 100644
index 5eb9859..0000000
--- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyServiceInterface.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.felix.dm.test.bundle.annotation.factory;
-
-public interface MyServiceInterface {
- public void added(String instanceId);
-
- public void changed(String modified);
-
- public void removed();
-}
diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceConsumer.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceConsumer.java
deleted file mode 100644
index 02a26ef..0000000
--- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceConsumer.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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.felix.dm.test.bundle.annotation.resource;
-
-import java.net.URL;
-
-import junit.framework.Assert;
-
-import org.apache.felix.dm.annotation.api.Component;
-import org.apache.felix.dm.annotation.api.ResourceDependency;
-import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.annotation.api.Stop;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
-
-/**
- * A Component which has a resource dependency.
- */
-@Component
-public class ResourceConsumer
-{
- @ServiceDependency(required=true,filter = "(test=resource)")
- Sequencer m_sequencer;
-
- private int m_resourcesSeen;
-
- @Start
- void start()
- {
- System.out.println("ResourceConsumer.start: sequencer=" + m_sequencer);
- }
-
- @ResourceDependency(required = false, filter = "(&(path=/path/to/*.txt)(host=localhost))")
- public void add(URL resource)
- {
- System.out.println("ResourceConsumer.add: resource=" + resource + ", m_sequencer=" + m_sequencer);
- if (match(resource, "file://localhost/path/to/test1.txt"))
- {
- m_resourcesSeen ++;
- return;
- }
-
- if (match(resource, "file://localhost/path/to/test2.txt"))
- {
- m_resourcesSeen ++;
- return;
- }
-
- Assert.fail("Got unexpected resource: " + resource);
- }
-
- private boolean match(URL resource, String url)
- {
- return url.equals(resource.toString());
- }
-
- @Stop
- void stop()
- {
- System.out.println("ResourceConsumer.stop: m_sequencer=" + m_sequencer);
- Assert.assertEquals(2, m_resourcesSeen);
- m_sequencer.step(1);
- }
-}
diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceConsumerField.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceConsumerField.java
deleted file mode 100644
index 04b27ab..0000000
--- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceConsumerField.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.apache.felix.dm.test.bundle.annotation.resource;
-
-import java.net.URL;
-
-import junit.framework.Assert;
-
-import org.apache.felix.dm.annotation.api.Component;
-import org.apache.felix.dm.annotation.api.Init;
-import org.apache.felix.dm.annotation.api.ResourceDependency;
-import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
-
-/**
- * A Component which as a resource dependency, using a class field.
- */
-@Component
-public class ResourceConsumerField
-{
- @ServiceDependency(required=true,filter = "(test=resourceField)")
- Sequencer m_sequencer;
-
- @ResourceDependency(filter = "(&(path=*/test1.txt)(host=localhost))")
- URL m_resource;
-
- @Init
- void init()
- {
- if (m_resource != null)
- {
- Assert.assertTrue("file://localhost/path/to/test1.txt".equals(m_resource.toString()));
- m_sequencer.step(1);
- }
- }
-}
diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceProvider.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceProvider.java
deleted file mode 100644
index 471ab30..0000000
--- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceProvider.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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.felix.dm.test.bundle.annotation.resource;
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import junit.framework.Assert;
-
-import org.apache.felix.dm.ResourceHandler;
-import org.apache.felix.dm.ResourceUtil;
-import org.apache.felix.dm.annotation.api.Component;
-import org.apache.felix.dm.annotation.api.Destroy;
-import org.apache.felix.dm.annotation.api.Inject;
-import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Filter;
-import org.osgi.framework.InvalidSyntaxException;
-
-/**
- * Provides some simple resources.
- */
-@Component
-public class ResourceProvider
-{
- @Inject
- private volatile BundleContext m_context;
- private final Map m_handlers = new HashMap();
- private URL[] m_resources;
-
- public ResourceProvider() throws Exception {
- m_resources = new URL[] {
- new URL("file://localhost/path/to/test1.txt"),
- new URL("file://localhost/path/to/test2.txt"),
- new URL("file://localhost/path/to/README.doc")
- };
- }
-
- /**
- * Handles a new Resource consumer
- * @param serviceProperties
- * @param handler
- */
- @ServiceDependency(removed = "remove", required=false)
- public void add(Map serviceProperties, ResourceHandler handler)
- {
- String filterString = (String) serviceProperties.get("filter");
- Filter filter = null;
- if (filterString != null) {
- try
- {
- filter = m_context.createFilter(filterString);
- }
- catch (InvalidSyntaxException e)
- {
- Assert.fail("Could not create filter for resource handler: " + e);
- return;
- }
- }
- synchronized (m_handlers)
- {
- m_handlers.put(handler, filter);
- }
- for (int i = 0; i < m_resources.length; i++)
- {
- if (filter == null || filter.match(ResourceUtil.createProperties(m_resources[i])))
- {
- handler.added(m_resources[i]);
- }
- }
- }
-
- /**
- * Remove a Resource consumer.
- * @param handler
- */
- public void remove(ResourceHandler handler)
- {
- Filter filter;
- synchronized (m_handlers)
- {
- filter = (Filter) m_handlers.remove(handler);
- }
- removeResources(handler, filter);
- }
-
- private void removeResources(ResourceHandler handler, Filter filter)
- {
- for (int i = 0; i < m_resources.length; i++)
- {
- if (filter == null || filter.match(ResourceUtil.createProperties(m_resources[i])))
- {
- handler.removed(m_resources[i]);
- }
- }
- }
-
- /**
- * Our component is being destroyed: notify all our registered Resource consumers that we don't
- * provide our Resources anymore.
- */
- @Destroy
- public void destroy()
- {
- Entry[] handlers;
- synchronized (m_handlers)
- {
- handlers = (Entry[]) m_handlers.entrySet().toArray(new Entry[m_handlers.size()]);
- }
- for (int i = 0; i < handlers.length; i++)
- {
- removeResources((ResourceHandler) handlers[i].getKey(), (Filter) handlers[i].getValue());
- }
- }
-}
diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ServiceConsumer.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ServiceConsumer.java
deleted file mode 100644
index 282be34..0000000
--- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ServiceConsumer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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.felix.dm.test.bundle.annotation.resource;
-
-import org.apache.felix.dm.annotation.api.Component;
-import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
-
-/**
- * A Component with a dependency over the ServiceInterface, which is actually provided
- * by a ResourceAdapter.
- */
-@Component
-public class ServiceConsumer
-{
- @ServiceDependency
- ServiceInterface m_serviceInterface;
-
- @ServiceDependency(filter = "(test=adapter)")
- Sequencer m_sequencer;
-
- @Start
- void start() {
- m_sequencer.step(1);
- m_serviceInterface.run();
- }
-}
diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ServiceInterface.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ServiceInterface.java
deleted file mode 100644
index 4422aa0..0000000
--- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ServiceInterface.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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.felix.dm.test.bundle.annotation.resource;
-
-/**
- * A Service provided the ServiceProvider, which is a ResourceAdapter.
- */
-public interface ServiceInterface extends Runnable
-{
-
-}
diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ServiceProvider.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ServiceProvider.java
deleted file mode 100644
index 74db944..0000000
--- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ServiceProvider.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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.felix.dm.test.bundle.annotation.resource;
-
-import java.net.URL;
-
-import junit.framework.Assert;
-
-import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.annotation.api.Inject;
-import org.apache.felix.dm.annotation.api.Property;
-import org.apache.felix.dm.annotation.api.ResourceAdapterService;
-import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
-import org.osgi.framework.BundleContext;
-
-/**
- * Our ServiceInterface provider, which service is activated by a ResourceAdapter.
- */
-@ResourceAdapterService(
- filter = "(&(path=/path/to/test1.txt)(host=localhost))",
- properties = {@Property(name="foo", value="bar")},
- propagate = true)
-public class ServiceProvider implements ServiceInterface
-{
- // Injected by reflection
- URL m_resource;
-
- @ServiceDependency(filter="(test=adapter)")
- Sequencer m_sequencer;
-
- // Check auto config injections
- @Inject
- BundleContext m_bc;
- BundleContext m_bcNotInjected;
-
- @Inject
- DependencyManager m_dm;
- DependencyManager m_dmNotInjected;
-
- @Inject
- org.apache.felix.dm.Component m_component;
- org.apache.felix.dm.Component m_componentNotInjected;
-
- public void run()
- {
- checkInjectedFields();
- Assert.assertNotNull("Resource has not been injected in the adapter", m_resource);
- Assert.assertEquals("ServiceProvider did not get expected resource", "file://localhost/path/to/test1.txt", m_resource.toString());
- m_sequencer.step(2);
- }
-
- private void checkInjectedFields()
- {
- if (m_bc == null)
- {
- m_sequencer.throwable(new Exception("Bundle Context not injected"));
- return;
- }
- if (m_bcNotInjected != null)
- {
- m_sequencer.throwable(new Exception("Bundle Context must not be injected"));
- return;
- }
-
- if (m_dm == null)
- {
- m_sequencer.throwable(new Exception("DependencyManager not injected"));
- return;
- }
- if (m_dmNotInjected != null)
- {
- m_sequencer.throwable(new Exception("DependencyManager must not be injected"));
- return;
- }
-
- if (m_component == null)
- {
- m_sequencer.throwable(new Exception("Component not injected"));
- return;
- }
- if (m_componentNotInjected != null)
- {
- m_sequencer.throwable(new Exception("Component must not be injected"));
- return;
- }
- }
-}
diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/simple/Consumer.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/simple/Consumer.java
deleted file mode 100644
index d63f1a0..0000000
--- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/simple/Consumer.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.felix.dm.test.bundle.annotation.simple;
-
-import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.annotation.api.Inject;
-import org.apache.felix.dm.annotation.api.Component;
-import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.annotation.api.Stop;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
-import org.osgi.framework.BundleContext;
-
-/**
- * Consumes a service which is provided by the {@link Producer} class.
- */
-@Component
-public class Consumer
-{
- @ServiceDependency
- volatile Runnable m_runnable;
-
- @ServiceDependency
- volatile Sequencer m_sequencer;
-
- @Inject
- volatile BundleContext m_bc;
- BundleContext m_bcNotInjected;
-
- @Inject
- volatile DependencyManager m_dm;
- DependencyManager m_dmNotInjected;
-
- @Inject
- volatile org.apache.felix.dm.Component m_component;
- org.apache.felix.dm.Component m_componentNotInjected;
-
- @Start
- protected void start() {
- checkInjectedFields();
- m_sequencer.step(3);
- m_runnable.run();
- }
-
- private void checkInjectedFields()
- {
- if (m_bc == null)
- {
- m_sequencer.throwable(new Exception("Bundle Context not injected"));
- return;
- }
- if (m_bcNotInjected != null)
- {
- m_sequencer.throwable(new Exception("Bundle Context must not be injected"));
- return;
- }
-
- if (m_dm == null)
- {
- m_sequencer.throwable(new Exception("DependencyManager not injected"));
- return;
- }
- if (m_dmNotInjected != null)
- {
- m_sequencer.throwable(new Exception("DependencyManager must not be injected"));
- return;
- }
-
- if (m_component == null)
- {
- m_sequencer.throwable(new Exception("Component not injected"));
- return;
- }
- if (m_componentNotInjected != null)
- {
- m_sequencer.throwable(new Exception("Component must not be injected"));
- return;
- }
- }
-
- @Stop
- protected void stop() {
- m_sequencer.step(6);
- }
-}
diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/simple/Producer.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/simple/Producer.java
deleted file mode 100644
index 3ab8fa0..0000000
--- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/simple/Producer.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.felix.dm.test.bundle.annotation.simple;
-
-import org.apache.felix.dm.annotation.api.Component;
-import org.apache.felix.dm.annotation.api.Property;
-import org.apache.felix.dm.annotation.api.Destroy;
-import org.apache.felix.dm.annotation.api.Init;
-import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.annotation.api.Registered;
-import org.apache.felix.dm.annotation.api.Stop;
-import org.apache.felix.dm.annotation.api.Unregistered;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * Provides a <code>Runnable</code> service, which is required by the {@link Consumer} class.
- */
-@Component(properties={@Property(name="foo", value="bar")})
-public class Producer implements Runnable
-{
- @ServiceDependency
- volatile Sequencer m_sequencer;
-
- @Init
- protected void init()
- {
- // Our component is initializing (at this point: all required dependencies are injected).
- m_sequencer.step(1);
- }
-
- @Start
- protected void start()
- {
- // We are about to be registered in the OSGi registry.
- m_sequencer.step(2);
- }
-
- public void run()
- {
- // the Consumer has been injected with our service, and is invoking our run() method.
- m_sequencer.step(4);
- }
-
- @Registered
- protected void started(ServiceRegistration sr)
- {
- // We are registered in the OSGi registry
- if (sr == null)
- {
- m_sequencer.throwable(new Exception("ServiceRegistration is null"));
- }
- if (!"bar".equals(sr.getReference().getProperty("foo")))
- {
- m_sequencer.throwable(new Exception("Invalid Service Properties"));
- }
- m_sequencer.step(5);
- }
-
- @Stop
- protected void stop()
- {
- // We are about to be unregistered from the OSGi registry, and we must stop.
- m_sequencer.step(7);
- }
-
- @Unregistered
- protected void stopped()
- {
- // We are unregistered from the OSGi registry.
- m_sequencer.step(8);
- }
-
- @Destroy
- public void destroy()
- {
- // Our component is shutting down.
- m_sequencer.step(9);
- }
-}
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/ResourceAnnotationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/ResourceAnnotationTest.java
deleted file mode 100644
index 7d4678e..0000000
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/ResourceAnnotationTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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.felix.dm.test.annotation;
-
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.provision;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-
-import java.util.Properties;
-
-import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.test.Base;
-import org.apache.felix.dm.test.BundleGenerator;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-
-/**
- * Use case: Verify Bundle Dependency annotations usage.
- */
-@RunWith(JUnit4TestRunner.class)
-public class ResourceAnnotationTest extends AnnotationBase
-{
- @Configuration
- public static Option[] configuration()
- {
- return options(
- systemProperty(DMLOG_PROPERTY).value( "true" ),
- provision(
- mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").version(Base.OSGI_SPEC_VERSION),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager").versionAsInProject(),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager.runtime").versionAsInProject()),
- provision(
- new BundleGenerator()
- .set(Constants.BUNDLE_SYMBOLICNAME, "ResourceTest")
- .set("Export-Package", "org.apache.felix.dm.test.bundle.annotation.sequencer")
- .set("Private-Package", "org.apache.felix.dm.test.bundle.annotation.resource")
- .set("Import-Package", "*")
- .set("-plugin", "org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin")
- .build()));
- }
-
- /**
- * Tests a simple ResourceConsumer
- * @param context
- */
- @Test
- public void testResourceAnnotation(BundleContext context)
- {
- DependencyManager m = new DependencyManager(context);
- Properties props = new Properties() {{ put("test", "resource"); }};
- m.add(m.createComponent().setImplementation(this).setInterface(Sequencer.class.getName(), props));
- super.stopBundle("ResourceTest", context);
- m_ensure.waitForStep(1, 10000);
- }
-
- /**
- * Tests a simple ResourceConsumer using a class field for resource injection
- */
- @Test
- public void testResourceAnnotationAutoConfig(BundleContext context)
- {
- DependencyManager m = new DependencyManager(context);
- Properties props = new Properties() {{ put("test", "resourceField"); }};
- m.add(m.createComponent().setImplementation(this).setInterface(Sequencer.class.getName(), props));
- super.stopBundle("ResourceTest", context);
- m_ensure.waitForStep(1, 10000);
- }
-
- /**
- * Tests a ResourceAdapter
- * @param context
- */
- @Test
- public void testResourceAdapterAnnotation(BundleContext context) throws Throwable
- {
- DependencyManager m = new DependencyManager(context);
- Properties props = new Properties() {{ put("test", "adapter"); }};
- m.add(m.createComponent().setImplementation(this).setInterface(Sequencer.class.getName(), props));
- super.stopBundle("ResourceTest", context);
- m_ensure.waitForStep(2, 10000);
- m_ensure.ensure();
- }
-}
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/ServiceFactoryAnnotationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/ServiceFactoryAnnotationTest.java
deleted file mode 100644
index a10bb2b..0000000
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/ServiceFactoryAnnotationTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.felix.dm.test.annotation;
-
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.provision;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Set;
-
-import junit.framework.Assert;
-
-import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.annotation.api.Component;
-import org.apache.felix.dm.test.Base;
-import org.apache.felix.dm.test.BundleGenerator;
-import org.apache.felix.dm.test.bundle.annotation.factory.MyService;
-import org.apache.felix.dm.test.bundle.annotation.factory.MyServiceInterface;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-
-@RunWith(JUnit4TestRunner.class)
-public class ServiceFactoryAnnotationTest extends AnnotationBase {
- @Configuration
- public static Option[] configuration() {
- return options(
- systemProperty(DMLOG_PROPERTY).value("true"),
- provision(
- mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium")
- .version(Base.OSGI_SPEC_VERSION),
- mavenBundle().groupId("org.apache.felix")
- .artifactId("org.apache.felix.dependencymanager").versionAsInProject(),
- mavenBundle().groupId("org.apache.felix")
- .artifactId("org.apache.felix.dependencymanager.runtime")
- .versionAsInProject()),
- provision(new BundleGenerator()
- .set(Constants.BUNDLE_SYMBOLICNAME, "ServiceFactoryAnnotationTest")
- .set("Export-Package", "org.apache.felix.dm.test.bundle.annotation.sequencer")
- .set("Private-Package", "org.apache.felix.dm.test.bundle.annotation.factory")
- .set("Import-Package", "*")
- .set("-plugin", "org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin").build()));
- }
-
- @Test
- public void testServiceFactory(BundleContext context) {
- DependencyManager m = new DependencyManager(context);
-
- // We provide ourself as a "Sequencer" service to the annotated bundles.
- m.add(m.createComponent().setImplementation(ServiceFactoryAnnotationTest.this)
- .setInterface(Sequencer.class.getName(), null));
-
- // Wait for the factory.
- m.add(m.createComponent()
- .setImplementation(this)
- .add(m.createServiceDependency()
- .setService(Set.class, "(" + Component.FACTORY_NAME + "=MyServiceFactory)")
- .setRequired(true).setCallbacks("bindFactory", null)));
-
- // Check if the test.annotation components have been initialized orderly
- m_ensure.waitForStep(10, 5000);
- }
-
- void bindFactory(Set factory) {
- // create a service instance with this configuration
- Hashtable conf = new Hashtable();
- conf.put("instance.id", "instance");
- conf.put(".private.param", "private");
- Assert.assertTrue(factory.add(conf));
- m_ensure.waitForStep(4, 5000);
-
- // update the service instance
- conf.put("instance.modified", "true");
- Assert.assertFalse(factory.add(conf));
- m_ensure.waitForStep(7, 5000);
-
- // remove instance
- Assert.assertTrue(factory.remove(conf));
- }
-}
\ No newline at end of file
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/SimpleAnnotationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/SimpleAnnotationTest.java
deleted file mode 100644
index 8c058d0..0000000
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/SimpleAnnotationTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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.felix.dm.test.annotation;
-
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.provision;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-
-import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.test.Base;
-import org.apache.felix.dm.test.BundleGenerator;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-
-/**
- * Use case: Ensure that a Provider can be injected into a Consumer, using simple DM annotations.
- */
-@RunWith(JUnit4TestRunner.class)
-public class SimpleAnnotationTest extends AnnotationBase
-{
- @Configuration
- public static Option[] configuration()
- {
- return options(
- systemProperty(DMLOG_PROPERTY).value( "true" ),
- provision(
- mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").version(Base.OSGI_SPEC_VERSION),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager").versionAsInProject(),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager.runtime").versionAsInProject()),
- provision(
- new BundleGenerator()
- .set(Constants.BUNDLE_SYMBOLICNAME, "SimpleAnnotationTest")
- .set("Export-Package", "org.apache.felix.dm.test.bundle.annotation.sequencer")
- .set("Private-Package", "org.apache.felix.dm.test.bundle.annotation.simple")
- .set("Import-Package", "*")
- .set("-plugin", "org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin")
- .build()));
- }
-
- @Test
- public void testSimpleAnnotations(BundleContext context) throws Throwable
- {
- DependencyManager m = new DependencyManager(context);
- // We provide ourself as a "Sequencer" service to the annotated bundles.
- m.add(m.createComponent().setImplementation(this).setInterface(Sequencer.class.getName(), null));
- // Check if the test.annotation components have been initialized orderly
- m_ensure.waitForStep(3, 10000);
- // Stop our annotation bundle.
- stopBundle("SimpleAnnotationTest", context);
- // And check if components have been deactivated orderly.
- m_ensure.waitForStep(9, 10000);
- m_ensure.ensure();
- }
-}