Mailing-List: contact commits-help@felix.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@felix.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1479656 - in /felix/trunk/ipojo/runtime:
 core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/
 core-it/src/it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/...
Date: Mon, 06 May 2013 17:53:40 -0000
To: commits@felix.apache.org
From: clement@apache.org
Message-Id: <20130506175340.7A97623888E3@eris.apache.org>

Author: clement
Date: Mon May  6 17:53:39 2013
New Revision: 1479656

URL: http://svn.apache.org/r1479656
Log:
Fix FELIX-4048 (https://issues.apache.org/jira/browse/FELIX-4048)
The factory cannot be started when such error occurs

Modified:
    felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadServiceDependencies.java
    felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDynamicPropsReconfiguration.java
    felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
    felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/DependencyModel.java

Modified: felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadServiceDependencies.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadServiceDependencies.java?rev=1479656&r1=1479655&r2=1479656&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadServiceDependencies.java (original)
+++ felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadServiceDependencies.java Mon May  6 17:53:39 2013
@@ -115,6 +115,22 @@ public class TestBadServiceDependencies 
         return elem;
     }
 
+    private Element getMissingSpecification() {
+        Element elem = new Element("component", "");
+        elem.addAttribute(new Attribute("classname", clazz));
+
+        // iPOJO cannot determine the specification of this type of dependency.
+        Element dependency = new Element("requires", "");
+        Element callback = new Element("callback", "");
+        callback.addAttribute(new Attribute("type", "bind"));
+        callback.addAttribute(new Attribute("method", "refBind"));
+        dependency.addElement(callback);
+        elem.addElement(dependency);
+
+        elem.addElement(manipulation);
+        return elem;
+    }
+
     private Element getManipulationForComponent() {
         String header = getTestBundle().getHeaders().get("iPOJO-Components");
         Element elem = null;
@@ -251,4 +267,25 @@ public class TestBadServiceDependencies 
             fail("Unexpected exception when creating an instance : " + e.getMessage());
         }
     }
+
+    /**
+     * Check that a component using a service dependency without service specification is rejected.
+     */
+    @Test
+    public void testDependencyWithoutSpecification() {
+        try {
+            ComponentFactory cf = new ComponentFactory(osgiHelper.getContext(), getMissingSpecification());
+            cf.start();
+            ComponentInstance ci = cf.createComponentInstance(props);
+            ci.dispose();
+            cf.stop();
+            fail("A service requirement with a bad type must be rejected " + cf);
+        } catch (ConfigurationException e) {
+            // OK
+        } catch (UnacceptableConfiguration e) {
+            fail("Unexpected exception when creating an instance : " + e.getMessage());
+        } catch (MissingHandlerException e) {
+            fail("Unexpected exception when creating an instance : " + e.getMessage());
+        }
+    }
 }

Modified: felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDynamicPropsReconfiguration.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDynamicPropsReconfiguration.java?rev=1479656&r1=1479655&r2=1479656&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDynamicPropsReconfiguration.java (original)
+++ felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDynamicPropsReconfiguration.java Mon May  6 17:53:39 2013
@@ -23,9 +23,12 @@ import org.apache.felix.ipojo.Factory;
 import org.apache.felix.ipojo.runtime.core.services.FooService;
 import org.junit.Before;
 import org.junit.Test;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
+import org.ow2.chameleon.testing.helpers.TimeUtils;
 
 import java.io.IOException;
 import java.util.Properties;
@@ -33,6 +36,7 @@ import java.util.Properties;
 import static junit.framework.Assert.assertEquals;
 import static org.junit.Assert.*;
 
+@ExamReactorStrategy(PerMethod.class)
 public class TestDynamicPropsReconfiguration extends Common {
     ComponentInstance fooProvider3, fooProvider4;
 
@@ -378,7 +382,7 @@ public class TestDynamicPropsReconfigura
         p3.put("intAProp", new int[]{1, 2, 3});
 
         configuration.update(p3);
-        Thread.sleep(200);
+        TimeUtils.grace(200);
 
         sr = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), "FooProvider-3");
         assertNotNull("Check the availability of the FS service", sr);
@@ -441,7 +445,7 @@ public class TestDynamicPropsReconfigura
         p3.put("intAProp", new int[]{1, 2, 3});
 
         configuration.update(p3);
-        Thread.sleep(200);
+        TimeUtils.grace(200);
 
         sr = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), "FooProvider-3");
         assertNotNull("Check the availability of the FS service", sr);
@@ -515,7 +519,7 @@ public class TestDynamicPropsReconfigura
         p3.put("intAProp", "{ 1, 2, 3}");
 
         configuration.update(p3);
-        Thread.sleep(200);
+        TimeUtils.grace(200);
 
         sr = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), "FooProvider-3");
         assertNotNull("Check the availability of the FS service", sr);
@@ -578,7 +582,7 @@ public class TestDynamicPropsReconfigura
         p3.put("intAProp", "{ 1, 2, 3}");
 
         configuration.update(p3);
-        Thread.sleep(200);
+        TimeUtils.grace(200);
 
         sr = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), "FooProvider-3");
         assertNotNull("Check the availability of the FS service", sr);

Modified: felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java?rev=1479656&r1=1479655&r2=1479656&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java (original)
+++ felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java Mon May  6 17:53:39 2013
@@ -18,14 +18,7 @@
  */
 package org.apache.felix.ipojo.handlers.dependency;
 
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
+import java.util.*;
 
 import org.apache.felix.ipojo.ConfigurationException;
 import org.apache.felix.ipojo.IPojoContext;
@@ -101,7 +94,7 @@ public class DependencyHandler extends P
     /**
      * List of dependencies of the component.
      */
-    private Dependency[] m_dependencies = new Dependency[0];
+    private final List<Dependency> m_dependencies = new ArrayList<Dependency>();
 
     /**
      * Is the handler started.
@@ -114,31 +107,11 @@ public class DependencyHandler extends P
     private DependencyHandlerDescription m_description;
 
     /**
-     * Add a dependency.
-     * @param dep : the dependency to add
-     */
-    private void addDependency(Dependency dep) {
-        for (int i = 0; m_dependencies != null && i < m_dependencies.length; i++) {
-            if (m_dependencies[i] == dep) {
-                return;
-            }
-        }
-        if (m_dependencies == null) {
-            m_dependencies = new Dependency[] { dep };
-        } else {
-            Dependency[] newDep = new Dependency[m_dependencies.length + 1];
-            System.arraycopy(m_dependencies, 0, newDep, 0, m_dependencies.length);
-            newDep[m_dependencies.length] = dep;
-            m_dependencies = newDep;
-        }
-    }
-
-    /**
      * Get the list of managed dependency.
      * @return the dependency list
      */
     public Dependency[] getDependencies() {
-        return m_dependencies;
+        return m_dependencies.toArray(new Dependency[m_dependencies.size()]);
     }
 
     /**
@@ -171,8 +144,7 @@ public class DependencyHandler extends P
             boolean initialState = getValidity();
 
             boolean valid = true;
-            for (int i = 0; i < m_dependencies.length; i++) {
-                Dependency dep = m_dependencies[i];
+            for (Dependency dep : m_dependencies) {
                 if (dep.getState() != Dependency.RESOLVED) {
                     valid = false;
                     break;
@@ -324,10 +296,23 @@ public class DependencyHandler extends P
         	}
         }
 
+        // At this point we must have discovered the specification, it it's null, throw a ConfiguraitonException
+        if (dep.getSpecification() == null) {
+            String id = dep.getId();
+            if (id == null) {
+                dep.getField();
+            }
+            if (id == null  && dep.getCallbacks() != null  && dep.getCallbacks().length > 0) {
+                id = dep.getCallbacks()[0].getMethodName();
+            }
+            throw new ConfigurationException("Cannot determine the targeted service specification for the dependency '" +
+                    id + "'");
+        }
+
         // Disable proxy on scalar dependency targeting non-interface specification
         if (! dep.isAggregate()  && dep.isProxy()) {
         	if (! dep.getSpecification().isInterface()) {
-        		warn("Proxies cannot be used on service dependency targetting non interface " +
+        		warn("Proxies cannot be used on service dependency targeting non interface " +
         				"service specification " + dep.getSpecification().getName());
         		dep.setProxy(false);
         	}
@@ -420,143 +405,44 @@ public class DependencyHandler extends P
 
         for (int i = 0; deps != null && i < deps.length; i++) {
             // Create the dependency metadata
-            String field = deps[i].getAttribute("field");
+            final Element dependencyElement = deps[i];
 
-            String serviceSpecification = deps[i].getAttribute("interface");
-            // the 'interface' attribute is deprecated
-            if (serviceSpecification != null) {
-                warn("The 'interface' attribute is deprecated, use the 'specification' attribute instead");
-            } else {
-                serviceSpecification = deps[i].getAttribute("specification");
-            }
-
-            String filter = deps[i].getAttribute("filter");
-            String opt = deps[i].getAttribute("optional");
+            String field = dependencyElement.getAttribute("field");
+            String serviceSpecification = getServiceSpecificationAttribute(dependencyElement);
+            String opt = dependencyElement.getAttribute("optional");
             boolean optional = opt != null && opt.equalsIgnoreCase("true");
-            String defaultImplem = deps[i].getAttribute("default-implementation");
+            String defaultImpl = dependencyElement.getAttribute("default-implementation");
 
-            String agg = deps[i].getAttribute("aggregate");
+            String agg = dependencyElement.getAttribute("aggregate");
             boolean aggregate = agg != null && agg.equalsIgnoreCase("true");
-            String identitity = deps[i].getAttribute("id");
-
-            String nul = deps[i].getAttribute("nullable");
-            boolean nullable = nul == null || nul.equalsIgnoreCase("true");
 
-            boolean isProxy = true;
-            // Detect proxy default value.
-            String setting = getInstanceManager().getContext().getProperty(PROXY_SETTINGS_PROPERTY);
+            String identity = dependencyElement.getAttribute("id");
 
-            // Felix also includes system properties in the bundle context property, however it is not the case of the
-            // other frameworks, so if it's null we should call System.getProperty.
-
-            if (setting == null) {
-                setting = System.getProperty(PROXY_SETTINGS_PROPERTY);
-            }
-
-            if (setting == null || PROXY_ENABLED.equals(setting)) { // If not set => Enabled
-                isProxy = true;
-            } else if (setting != null  && PROXY_DISABLED.equals(setting)) {
-                isProxy = false;
-            }
+            String nul = dependencyElement.getAttribute("nullable");
+            boolean nullable = nul == null || nul.equalsIgnoreCase("true");
 
-            String proxy = deps[i].getAttribute("proxy");
-            // If proxy == null, use default value
-            if (proxy != null) {
-                if (proxy.equals("false")) {
-                    isProxy = false;
-                } else if (proxy.equals("true")) {
-                    if (! isProxy) { // The configuration overrides the system setting
-                        warn("The configuration of a service dependency overrides the proxy mode");
-                    }
-                    isProxy = true;
-                }
-            }
+            boolean isProxy = isProxy(dependencyElement);
 
-            String scope = deps[i].getAttribute("scope");
-            BundleContext context = getInstanceManager().getContext(); // Get the default bundle context.
-            if (scope != null) {
-                // If we are not in a composite, the policy is set to global.
-                if (scope.equalsIgnoreCase("global") || ((((IPojoContext) getInstanceManager().getContext()).getServiceContext()) == null)) {
-                    context =
-                            new PolicyServiceContext(getInstanceManager().getGlobalContext(), getInstanceManager().getLocalServiceContext(),
-                                    PolicyServiceContext.GLOBAL);
-                } else if (scope.equalsIgnoreCase("composite")) {
-                    context =
-                            new PolicyServiceContext(getInstanceManager().getGlobalContext(), getInstanceManager().getLocalServiceContext(),
-                                    PolicyServiceContext.LOCAL);
-                } else if (scope.equalsIgnoreCase("composite+global")) {
-                    context =
-                            new PolicyServiceContext(getInstanceManager().getGlobalContext(), getInstanceManager().getLocalServiceContext(),
-                                    PolicyServiceContext.LOCAL_AND_GLOBAL);
-                }
-            }
-
-            // Get instance filter if available
-            if (filtersConfiguration != null && identitity != null && filtersConfiguration.get(identitity) != null) {
-                filter = (String) filtersConfiguration.get(identitity);
-            }
-
-            // Compute the 'from' attribute
-            String from = deps[i].getAttribute("from");
-            if (fromConfiguration != null && identitity != null && fromConfiguration.get(identitity) != null) {
-                from = (String) fromConfiguration.get(identitity);
-            }
-            if (from != null) {
-                String fromFilter = "(|(instance.name=" + from + ")(service.pid=" + from + "))";
-                if (aggregate) {
-                    warn("The 'from' attribute is incompatible with aggregate requirements: only one provider will match : " + fromFilter);
-                }
-                if (filter != null) {
-                    filter = "(&" + fromFilter + filter + ")"; // Append the two filters
-                } else {
-                    filter = fromFilter;
-                }
-            }
-
-            Filter fil = null;
-            if (filter != null) {
-                try {
-                    fil = getInstanceManager().getContext().createFilter(filter);
-                } catch (InvalidSyntaxException e) {
-                    throw new ConfigurationException("A requirement filter is invalid : " + filter, e);
-                }
-            }
+            BundleContext context = getFacetedBundleContext(dependencyElement);
 
+            String filter = computeFilter(dependencyElement, filtersConfiguration, fromConfiguration, aggregate, identity);
+            Filter fil = createAndCheckFilter(filter);
 
             Class spec = null;
             if (serviceSpecification != null) {
                 spec = DependencyModel.loadSpecification(serviceSpecification, getInstanceManager().getContext());
             }
 
-            int policy = DependencyModel.getPolicy(deps[i]);
-            Comparator cmp = DependencyModel.getComparator(deps[i], getInstanceManager().getGlobalContext());
-
+            int policy = DependencyModel.getPolicy(dependencyElement);
+            Comparator cmp = DependencyModel.getComparator(dependencyElement, getInstanceManager().getGlobalContext());
 
-            Dependency dep = new Dependency(this, field, spec, fil, optional, aggregate, nullable, isProxy, identitity, context, policy, cmp, defaultImplem);
+            Dependency dep = new Dependency(this, field, spec, fil, optional, aggregate, nullable, isProxy, identity, context, policy, cmp, defaultImpl);
 
             // Look for dependency callback :
-            Element[] cbs = deps[i].getElements("Callback");
-            for (int j = 0; cbs != null && j < cbs.length; j++) {
-                if (!cbs[j].containsAttribute("method") && cbs[j].containsAttribute("type")) {
-                    throw new ConfigurationException("Requirement Callback : a dependency callback must contain a method and a type (bind or unbind) attribute");
-                }
-                String method = cbs[j].getAttribute("method");
-                String type = cbs[j].getAttribute("type");
-                int methodType = 0;
-                if ("bind".equalsIgnoreCase(type)) {
-                    methodType = DependencyCallback.BIND;
-                } else if ("modified".equalsIgnoreCase(type)) {
-                    methodType = DependencyCallback.MODIFIED;
-                } else {
-                    methodType = DependencyCallback.UNBIND;
-                }
-
-                DependencyCallback callback = new DependencyCallback(dep, method, methodType);
-                dep.addDependencyCallback(callback);
-            }
+            addCallbacksToDependency(dependencyElement, dep);
 
             // Add the constructor parameter if needed
-            String paramIndex = deps[i].getAttribute("constructor-parameter");
+            String paramIndex = dependencyElement.getAttribute("constructor-parameter");
             if (paramIndex != null) {
             	int index = Integer.parseInt(paramIndex);
             	dep.addConstructorInjection(index);
@@ -564,7 +450,7 @@ public class DependencyHandler extends P
 
             // Check the dependency :
             if (checkDependency(dep, manipulation)) {
-                addDependency(dep);
+                m_dependencies.add(dep);
                 if (dep.getField() != null) {
                     getInstanceManager().register(manipulation.getField(dep.getField()), dep);
                     atLeastOneField = true;
@@ -574,17 +460,153 @@ public class DependencyHandler extends P
 
         if (atLeastOneField) { // Does register only if we have fields
             MethodMetadata[] methods = manipulation.getMethods();
-            for (int i = 0; i < methods.length; i++) {
-                for (int j = 0; j < m_dependencies.length; j++) {
-                    getInstanceManager().register(methods[i], m_dependencies[j]);
+            for (MethodMetadata method : methods) {
+                for (Dependency dep : m_dependencies) {
+                    getInstanceManager().register(method, dep);
                 }
             }
         }
 
-        m_description = new DependencyHandlerDescription(this, m_dependencies); // Initialize the description.
+        m_description = new DependencyHandlerDescription(this, getDependencies()); // Initialize the description.
     }
 
-	/**
+    private String computeFilter(Element dependencyElement, Dictionary filtersConfiguration, Dictionary fromConfiguration, boolean aggregate, String identity) {
+        String filter = dependencyElement.getAttribute("filter");
+        // Get instance filter if available
+        if (filtersConfiguration != null && identity != null && filtersConfiguration.get(identity) != null) {
+            filter = (String) filtersConfiguration.get(identity);
+        }
+
+        // Compute the 'from' attribute
+        filter = updateFilterIfFromIsEnabled(fromConfiguration, dependencyElement, filter, aggregate, identity);
+        return filter;
+    }
+
+    private String updateFilterIfFromIsEnabled(Dictionary fromConfiguration, Element dependencyElement, String filter, boolean aggregate, String identity) {
+        String from = dependencyElement.getAttribute("from");
+        if (fromConfiguration != null && identity != null && fromConfiguration.get(identity) != null) {
+            from = (String) fromConfiguration.get(identity);
+        }
+        if (from != null) {
+            String fromFilter = "(|(instance.name=" + from + ")(service.pid=" + from + "))";
+            if (aggregate) {
+                warn("The 'from' attribute is incompatible with aggregate requirements: only one provider will match : " + fromFilter);
+            }
+            if (filter != null) {
+                filter = "(&" + fromFilter + filter + ")"; // Append the two filters
+            } else {
+                filter = fromFilter;
+            }
+        }
+        return filter;
+    }
+
+    private boolean isProxy(Element dependencyElement) {
+        boolean isProxy = true;
+        String setting = getProxySetting();
+
+        if (setting == null || PROXY_ENABLED.equals(setting)) { // If not set => Enabled
+            isProxy = true;
+        } else if (PROXY_DISABLED.equals(setting)) {
+            isProxy = false;
+        }
+
+        String proxy = dependencyElement.getAttribute("proxy");
+        // If proxy == null, use default value
+        if (proxy != null) {
+            if (proxy.equals("false")) {
+                isProxy = false;
+            } else if (proxy.equals("true")) {
+                if (! isProxy) { // The configuration overrides the system setting
+                    warn("The configuration of a service dependency overrides the proxy mode");
+                }
+                isProxy = true;
+            }
+        }
+        return isProxy;
+    }
+
+    private String getProxySetting() {
+        // Detect proxy default value.
+        String setting = getInstanceManager().getContext().getProperty(PROXY_SETTINGS_PROPERTY);
+
+        // Felix also includes system properties in the bundle context property, however it is not the case of the
+        // other frameworks, so if it's null we should call System.getProperty.
+
+        if (setting == null) {
+            setting = System.getProperty(PROXY_SETTINGS_PROPERTY);
+        }
+        return setting;
+    }
+
+    private void addCallbacksToDependency(Element dependencyElement, Dependency dep) throws ConfigurationException {
+        Element[] cbs = dependencyElement.getElements("Callback");
+        for (int j = 0; cbs != null && j < cbs.length; j++) {
+            if (!cbs[j].containsAttribute("method") && cbs[j].containsAttribute("type")) {
+                throw new ConfigurationException("Requirement Callback : a dependency callback must contain a method " +
+                        "and a type (bind or unbind) attribute");
+            }
+            String method = cbs[j].getAttribute("method");
+            String type = cbs[j].getAttribute("type");
+
+            int methodType = DependencyCallback.UNBIND;
+            if ("bind".equalsIgnoreCase(type)) {
+                methodType = DependencyCallback.BIND;
+            } else if ("modified".equalsIgnoreCase(type)) {
+                methodType = DependencyCallback.MODIFIED;
+            }
+
+            DependencyCallback callback = new DependencyCallback(dep, method, methodType);
+            dep.addDependencyCallback(callback);
+        }
+    }
+
+    private Filter createAndCheckFilter(String filter) throws ConfigurationException {
+        Filter fil = null;
+        if (filter != null) {
+            try {
+                fil = getInstanceManager().getContext().createFilter(filter);
+            } catch (InvalidSyntaxException e) {
+                throw new ConfigurationException("A requirement filter is invalid : " + filter, e);
+            }
+        }
+        return fil;
+    }
+
+    private BundleContext getFacetedBundleContext(Element dep) {
+        String scope = dep.getAttribute("scope");
+        BundleContext context = getInstanceManager().getContext(); // Get the default bundle context.
+        if (scope != null) {
+            // If we are not in a composite, the policy is set to global.
+            if (scope.equalsIgnoreCase("global") || ((((IPojoContext) getInstanceManager().getContext()).getServiceContext()) == null)) {
+                context =
+                        new PolicyServiceContext(getInstanceManager().getGlobalContext(), getInstanceManager().getLocalServiceContext(),
+                                PolicyServiceContext.GLOBAL);
+            } else if (scope.equalsIgnoreCase("composite")) {
+                context =
+                        new PolicyServiceContext(getInstanceManager().getGlobalContext(), getInstanceManager().getLocalServiceContext(),
+                                PolicyServiceContext.LOCAL);
+            } else if (scope.equalsIgnoreCase("composite+global")) {
+                context =
+                        new PolicyServiceContext(getInstanceManager().getGlobalContext(), getInstanceManager().getLocalServiceContext(),
+                                PolicyServiceContext.LOCAL_AND_GLOBAL);
+            }
+        }
+        return context;
+    }
+
+    private String getServiceSpecificationAttribute(Element dep) {
+        String serviceSpecification = dep.getAttribute("interface");
+        // the 'interface' attribute is deprecated
+        if (serviceSpecification != null) {
+            warn("The 'interface' attribute is deprecated, use the 'specification' attribute instead");
+        } else {
+            serviceSpecification = dep.getAttribute("specification");
+        }
+        return serviceSpecification;
+    }
+
+    /**
 	 * Gets the requires filter configuration from the given object.
 	 * The given object must come from the instance configuration.
 	 * This method was made to fix FELIX-2688. It supports filter configuration using
@@ -606,7 +628,7 @@ public class DependencyHandler extends P
 						"A requirement filter is invalid : "
 								+ requiresFiltersValue);
 			}
-			Dictionary requiresFilters = new Hashtable();
+			Dictionary<String, Object> requiresFilters = new Hashtable<String, Object>();
 			for (int i = 0; i < filtersArray.length; i += 2) {
 				requiresFilters.put(filtersArray[i], filtersArray[i + 1]);
 			}
@@ -622,9 +644,7 @@ public class DependencyHandler extends P
      */
     public void start() {
         // Start the dependencies
-        for (int i = 0; i < m_dependencies.length; i++) {
-            Dependency dep = m_dependencies[i];
-
+        for (Dependency dep : m_dependencies) {
             dep.start();
         }
         // Check the state
@@ -639,8 +659,8 @@ public class DependencyHandler extends P
      */
     public void stop() {
         m_started = false;
-        for (int i = 0; i < m_dependencies.length; i++) {
-            m_dependencies[i].stop();
+        for (Dependency dep : m_dependencies) {
+            dep.stop();
         }
     }
 
@@ -650,8 +670,8 @@ public class DependencyHandler extends P
      * @see org.apache.felix.ipojo.PrimitiveHandler#onCreation(Object)
      */
     public void onCreation(Object instance) {
-        for (int i = 0; i < m_dependencies.length; i++) {
-            m_dependencies[i].onObjectCreation(instance);
+        for (Dependency dep : m_dependencies) {
+            dep.onObjectCreation(instance);
         }
     }
 

Modified: felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/DependencyModel.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/DependencyModel.java?rev=1479656&r1=1479655&r2=1479656&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/DependencyModel.java (original)
+++ felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/DependencyModel.java Mon May  6 17:53:39 2013
@@ -116,7 +116,7 @@ public abstract class DependencyModel im
 
     /**
      * Bundle context used by the dependency.
-     * (may be a {@link ServiceContext}).
+     * (may be a {@link org.apache.felix.ipojo.ServiceContext}).
      */
     private BundleContext m_context;
 
@@ -416,26 +416,26 @@ public abstract class DependencyModel im
      * A service provider goes away. The depart needs to be managed only if the
      * reference was used.
      * @param ref the leaving service reference
-     * @param arg1 the service object if the service was already get
+     * @param svc the service object if the service was already get
      * @see org.apache.felix.ipojo.util.TrackerCustomizer#removedService(org.osgi.framework.ServiceReference, java.lang.Object)
      */
-    public void removedService(ServiceReference ref, Object arg1) {
+    public void removedService(ServiceReference ref, Object svc) {
         if (m_matchingRefs.contains(ref)) {
-            manageDeparture(ref, arg1);
+            manageDeparture(ref, svc);
         }
     }
 
     /**
      * Manages the departure of a used service.
      * @param ref the leaving service reference
-     * @param obj the service object if the service was get
+     * @param svc the service object if the service was get
      */
-    private void manageDeparture(ServiceReference ref, Object obj) {
+    private void manageDeparture(ServiceReference ref, Object svc) {
         // Unget the service reference
         ungetService(ref);
 
         // If we already get this service and the binding policy is static, the dependency becomes broken
-        if (isFrozen() && obj != null) {
+        if (isFrozen() && svc != null) {
             if (m_state != BROKEN) {
                 m_state = BROKEN;
                 invalidate();  // This will invalidate the instance.
@@ -452,13 +452,13 @@ public abstract class DependencyModel im
             synchronized (this) {
                 m_matchingRefs.remove(ref);
             }
-            if (obj == null) {
+            if (svc == null) {
                 computeDependencyState(); // check if the dependency stills valid.
             } else {
                 // A used service disappears, we have to sort the available providers to choose the best one.
                 // However, the sort has to be done only for scalar dependencies following the dynamic binding
                 // policy. Static dependencies will be broken, DP dependencies are always sorted.
-                // Aggregate dependencies does not need to be sort, as it will change the array
+                // Aggregate dependencies does not need to be sorted, as it will change the array
                 // order.
                 if (m_comparator != null && m_policy == DYNAMIC_BINDING_POLICY && ! m_aggregate) {
                     Collections.sort(m_matchingRefs, m_comparator);