You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ma...@apache.org on 2009/12/02 14:03:42 UTC
svn commit: r886135 - in /felix/trunk/dependencymanager:
core/src/main/java/org/apache/felix/dependencymanager/
core/src/main/java/org/apache/felix/dependencymanager/resources/
test/src/test/java/org/apache/felix/dependencymanager/test/
Author: marrs
Date: Wed Dec 2 13:03:39 2009
New Revision: 886135
URL: http://svn.apache.org/viewvc?rev=886135&view=rev
Log:
added support for resources and resource dependencies, plus a test case
Added:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ResourceDependencyTest.java
Modified:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/DependencyManager.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/resources/Resource.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/resources/ResourceHandler.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/AspectTest.java
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/DependencyManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/DependencyManager.java?rev=886135&r1=886134&r2=886135&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/DependencyManager.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/DependencyManager.java Wed Dec 2 13:03:39 2009
@@ -25,6 +25,7 @@
import org.apache.felix.dependencymanager.dependencies.BundleDependency;
import org.apache.felix.dependencymanager.dependencies.ConfigurationDependency;
+import org.apache.felix.dependencymanager.dependencies.ResourceDependency;
import org.apache.felix.dependencymanager.dependencies.ServiceDependency;
import org.apache.felix.dependencymanager.dependencies.TemporalServiceDependency;
import org.apache.felix.dependencymanager.impl.AspectImpl;
@@ -102,15 +103,43 @@
public TemporalServiceDependency createTemporalServiceDependency() {
return new TemporalServiceDependency(m_context, m_logger);
}
-
+
+ /**
+ * Creates a new configuration dependency.
+ *
+ * @return
+ */
public ConfigurationDependency createConfigurationDependency() {
return new ConfigurationDependency(m_context, m_logger);
}
+ /**
+ * Creates a new bundle dependency.
+ *
+ * @return
+ */
public BundleDependency createBundleDependency() {
return new BundleDependency(m_context, m_logger);
}
+
+ /**
+ * Creates a new resource dependency.
+ *
+ * @return
+ */
+ public ResourceDependency createResourceDependency() {
+ return new ResourceDependency(m_context, m_logger);
+ }
+ /**
+ * Creates a new aspect.
+ *
+ * @param serviceInterface
+ * @param serviceFilter
+ * @param aspectImplementation
+ * @param properties
+ * @return
+ */
public Service createAspectService(Class serviceInterface, String serviceFilter, Object aspectImplementation, Dictionary properties) {
return createService()
.setImplementation(new AspectImpl(serviceInterface, serviceFilter, aspectImplementation, properties))
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/resources/Resource.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/resources/Resource.java?rev=886135&r1=886134&r2=886135&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/resources/Resource.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/resources/Resource.java Wed Dec 2 13:03:39 2009
@@ -21,8 +21,11 @@
import java.io.IOException;
import java.io.InputStream;
-/** Interface that defines a resource. */
+/**
+ * Interface that defines a resource.
+ */
public interface Resource {
+ public static final String FILTER = "filter";
public static final String PATH = "path";
public static final String NAME = "name";
public static final String REPOSITORY = "repository";
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/resources/ResourceHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/resources/ResourceHandler.java?rev=886135&r1=886134&r2=886135&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/resources/ResourceHandler.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/resources/ResourceHandler.java Wed Dec 2 13:03:39 2009
@@ -18,7 +18,9 @@
*/
package org.apache.felix.dependencymanager.resources;
-/** Service interface for anybody wanting to be notified of changes to resources. */
+/**
+ * Service interface for anybody wanting to be notified of changes to resources.
+ */
public interface ResourceHandler {
void added(Resource resource);
void changed(Resource resource);
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/AspectTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/AspectTest.java?rev=886135&r1=886134&r2=886135&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/AspectTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/AspectTest.java Wed Dec 2 13:03:39 2009
@@ -48,7 +48,7 @@
}
@Test
- public void testServiceRegistrationAndConsumption(BundleContext context) {
+ public void testDynamicallyAddAndRemoveAspect(BundleContext context) {
DependencyManager m = new DependencyManager(context, new Logger(context));
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
Added: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ResourceDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ResourceDependencyTest.java?rev=886135&view=auto
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ResourceDependencyTest.java (added)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ResourceDependencyTest.java Wed Dec 2 13:03:39 2009
@@ -0,0 +1,189 @@
+/*
+ * 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.dependencymanager.test;
+
+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 java.io.IOException;
+import java.io.InputStream;
+import java.util.Dictionary;
+import java.util.Properties;
+
+import junit.framework.Assert;
+
+import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dependencymanager.Service;
+import org.apache.felix.dependencymanager.impl.Logger;
+import org.apache.felix.dependencymanager.resources.Resource;
+import org.apache.felix.dependencymanager.resources.ResourceHandler;
+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.Filter;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+
+@RunWith(JUnit4TestRunner.class)
+public class ResourceDependencyTest {
+ @Configuration
+ public static Option[] configuration() {
+ return options(
+ provision(
+ mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").version("4.2.0"),
+ mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager").versionAsInProject()
+ )
+ );
+ }
+
+ @Test
+ public void testResourceDependency(BundleContext context) {
+ DependencyManager m = new DependencyManager(context, new Logger(context));
+ // helper class that ensures certain steps get executed in sequence
+ Ensure e = new Ensure();
+ // create a service provider and consumer
+ ResourceConsumer c = new ResourceConsumer();
+ Service consumer = m.createService().setImplementation(c).add(m.createResourceDependency().setFilter("(&(path=/test)(name=*.txt)(repository=TestRepository))").setCallbacks("add", "remove"));
+ Service resourceProvider = m.createService().setImplementation(new ResourceProvider(e)).add(m.createServiceDependency().setService(ResourceHandler.class).setCallbacks("add", "remove"));
+ m.add(consumer);
+ m.add(resourceProvider);
+ e.step(3);
+ m.remove(resourceProvider);
+ m.remove(consumer);
+ c.ensure();
+ }
+
+ static class ResourceConsumer {
+ private volatile int m_counter;
+ public void add(Resource resource) {
+ m_counter++;
+ try {
+ resource.openStream();
+ }
+ catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ public void remove(Resource resource) {
+ m_counter--;
+ }
+ public void ensure() {
+ Assert.assertTrue("all resources should have been added and removed at this point, but " + m_counter + " are remaining", m_counter == 0);
+ }
+ }
+
+ static class ResourceProvider {
+ private volatile BundleContext m_context;
+ private final Ensure m_ensure;
+ private StaticResource[] m_resources = {
+ new StaticResource("test1.txt", "/test", "TestRepository") {
+ public InputStream openStream() throws IOException {
+ m_ensure.step(1);
+ return null;
+ };
+ },
+ new StaticResource("test2.txt", "/test", "TestRepository") {
+ public InputStream openStream() throws IOException {
+ m_ensure.step(2);
+ return null;
+ };
+ },
+ new StaticResource("README.doc", "/", "TestRepository") {
+ public InputStream openStream() throws IOException {
+ Assert.fail("resource should not have matched the filter");
+ return null;
+ };
+ }
+ };
+
+ public ResourceProvider(Ensure ensure) {
+ m_ensure = ensure;
+ }
+
+ public void add(ServiceReference ref, ResourceHandler handler) {
+ String filterString = (String) ref.getProperty("filter");
+ try {
+ Filter filter = m_context.createFilter(filterString);
+ for (int i = 0; i < m_resources.length; i++) {
+ if (filter.match(m_resources[i].getProperties())) {
+ handler.added(m_resources[i]);
+ }
+ }
+ }
+ catch (InvalidSyntaxException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void remove(ServiceReference ref, ResourceHandler handler) {
+ String filterString = (String) ref.getProperty("filter");
+ try {
+ Filter filter = m_context.createFilter(filterString);
+ for (int i = 0; i < m_resources.length; i++) {
+ if (filter.match(m_resources[i].getProperties())) {
+ handler.removed(m_resources[i]);
+ }
+ }
+ }
+ catch (InvalidSyntaxException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ static class StaticResource implements Resource {
+ private String m_name;
+ private String m_path;
+ private String m_repository;
+
+ public StaticResource(String name, String path, String repository) {
+ m_name = name;
+ m_path = path;
+ m_repository = repository;
+ }
+
+ public String getName() {
+ return m_name;
+ }
+
+ public String getPath() {
+ return m_path;
+ }
+
+ public String getRepository() {
+ return m_repository;
+ }
+
+ public Dictionary getProperties() {
+ return new Properties() {{
+ put(Resource.NAME, getName());
+ put(Resource.PATH, getPath());
+ put(Resource.REPOSITORY, getRepository());
+ }};
+ }
+
+ public InputStream openStream() throws IOException {
+ return null;
+ }
+ }
+}