You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by pa...@apache.org on 2011/09/13 16:06:22 UTC
svn commit: r1170188 [3/7] - in /incubator/ace/trunk: ./
ace-deployment-verifier-ui/ ace-deployment-verifier-ui/src/
ace-deployment-verifier-ui/src/main/
ace-deployment-verifier-ui/src/main/java/
ace-deployment-verifier-ui/src/main/java/org/ ace-deploy...
Added: incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/Candidates.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/Candidates.java?rev=1170188&view=auto
==============================================================================
--- incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/Candidates.java (added)
+++ incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/Candidates.java Tue Sep 13 14:06:20 2011
@@ -0,0 +1,1129 @@
+/*
+ * 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.framework.resolver;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+// import org.apache.felix.framework.BundleRevisionImpl;
+import org.apache.felix.framework.resolver.Resolver.ResolverState;
+import org.apache.felix.framework.util.FelixConstants;
+import org.apache.felix.framework.util.Util;
+import org.apache.felix.framework.wiring.BundleCapabilityImpl;
+import org.apache.felix.framework.wiring.BundleRequirementImpl;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Version;
+import org.osgi.framework.wiring.BundleCapability;
+import org.osgi.framework.wiring.BundleRequirement;
+import org.osgi.framework.wiring.BundleRevision;
+import org.osgi.framework.wiring.BundleWire;
+import org.osgi.framework.wiring.BundleWiring;
+
+class Candidates
+{
+ public static final int MANDATORY = 0;
+ public static final int OPTIONAL = 1;
+ public static final int ON_DEMAND = 2;
+
+ // Set of all mandatory bundle revisions.
+ private final Set<BundleRevision> m_mandatoryRevisions;
+ // Set of all involved bundle revisions.
+ private final Set<BundleRevision> m_involvedRevisions;
+ // Maps a capability to requirements that match it.
+ private final Map<BundleCapability, Set<BundleRequirement>> m_dependentMap;
+ // Maps a requirement to the capability it matches.
+ private final Map<BundleRequirement, SortedSet<BundleCapability>> m_candidateMap;
+ // Maps a host capability to a map containing its potential fragments;
+ // the fragment map maps a fragment symbolic name to a map that maps
+ // a version to a list of fragments requirements matching that symbolic
+ // name and version.
+ private final Map<BundleCapability,
+ Map<String, Map<Version, List<BundleRequirement>>>> m_hostFragments;
+ // Maps a bundle revision to its associated wrapped revision; this only happens
+ // when a revision being resolved has fragments to attach to it.
+ private final Map<BundleRevision, HostBundleRevision> m_allWrappedHosts;
+ // Map used when populating candidates to hold intermediate and final results.
+ private final Map<BundleRevision, Object> m_populateResultCache;
+
+ // Flag to signal if fragments are present in the candidate map.
+ private boolean m_fragmentsPresent = false;
+
+ /**
+ * Private copy constructor used by the copy() method.
+ * @param dependentMap the capability dependency map.
+ * @param candidateMap the requirement candidate map.
+ * @param hostFragments the fragment map.
+ * @param wrappedHosts the wrapped hosts map.
+ **/
+ private Candidates(
+ Set<BundleRevision> mandatoryRevisions, Set<BundleRevision> involvedRevisions,
+ Map<BundleCapability, Set<BundleRequirement>> dependentMap,
+ Map<BundleRequirement, SortedSet<BundleCapability>> candidateMap,
+ Map<BundleCapability, Map<String, Map<Version, List<BundleRequirement>>>> hostFragments,
+ Map<BundleRevision, HostBundleRevision> wrappedHosts, Map<BundleRevision, Object> populateResultCache,
+ boolean fragmentsPresent)
+ {
+ m_mandatoryRevisions = mandatoryRevisions;
+ m_involvedRevisions = involvedRevisions;
+ m_dependentMap = dependentMap;
+ m_candidateMap = candidateMap;
+ m_hostFragments = hostFragments;
+ m_allWrappedHosts = wrappedHosts;
+ m_populateResultCache = populateResultCache;
+ m_fragmentsPresent = fragmentsPresent;
+ }
+
+ /**
+ * Constructs an empty Candidates object.
+ **/
+ public Candidates()
+ {
+ m_mandatoryRevisions = new HashSet<BundleRevision>();
+ m_involvedRevisions = new HashSet<BundleRevision>();
+ m_dependentMap = new HashMap<BundleCapability, Set<BundleRequirement>>();
+ m_candidateMap = new HashMap<BundleRequirement, SortedSet<BundleCapability>>();
+ m_hostFragments =
+ new HashMap<BundleCapability, Map<String, Map<Version, List<BundleRequirement>>>>();
+ m_allWrappedHosts = new HashMap<BundleRevision, HostBundleRevision>();
+ m_populateResultCache = new HashMap<BundleRevision, Object>();
+ }
+
+ /**
+ * Populates candidates for the specified revision. How a revision is
+ * resolved depends on its resolution type as follows:
+ * <ul>
+ * <li><tt>MANDATORY</tt> - must resolve and failure to do so throws
+ * an exception.</li>
+ * <li><tt>OPTIONAL</tt> - attempt to resolve, but no exception is thrown
+ * if the resolve fails.</li>
+ * <li><tt>ON_DEMAND</tt> - only resolve on demand; this only applies to
+ * fragments and will only resolve a fragment if its host is already
+ * selected as a candidate.</li>
+ * </ul>
+ * @param state the resolver state used for populating the candidates.
+ * @param revision the revision whose candidates should be populated.
+ * @param resolution indicates the resolution type.
+ */
+ public final void populate(
+ ResolverState state, BundleRevision revision, int resolution)
+ {
+ // Get the current result cache value, to make sure the revision
+ // hasn't already been populated.
+ Object cacheValue = m_populateResultCache.get(revision);
+ // Has been unsuccessfully populated.
+ if (cacheValue instanceof ResolveException)
+ {
+ return;
+ }
+ // Has been successfully populated.
+ else if (cacheValue instanceof Boolean)
+ {
+ return;
+ }
+
+ // We will always attempt to populate fragments, since this is necessary
+ // for ondemand attaching of fragment. However, we'll only attempt to
+ // populate optional non-fragment revisions if they aren't already
+ // resolved.
+ boolean isFragment = Util.isFragment(revision);
+ if (!isFragment && (revision.getWiring() != null))
+ {
+ return;
+ }
+
+ // Always attempt to populate mandatory or optional revisions.
+ // However, for on-demand fragments only populate if their host
+ // is already populated.
+ if ((resolution != ON_DEMAND)
+ || (isFragment && populateFragment(state, revision)))
+ {
+ if (resolution == MANDATORY)
+ {
+ m_mandatoryRevisions.add(revision);
+ }
+ try
+ {
+ // Try to populate candidates for the optional revision.
+ populateRevision(state, revision);
+ }
+ catch (ResolveException ex)
+ {
+ // Only throw an exception if resolution is mandatory.
+ if (resolution == MANDATORY)
+ {
+ throw ex;
+ }
+ }
+ }
+ }
+
+ /**
+ * Populates candidates for the specified revision.
+ * @param state the resolver state used for populating the candidates.
+ * @param revision the revision whose candidates should be populated.
+ */
+// TODO: FELIX3 - Modify to not be recursive.
+ private void populateRevision(ResolverState state, BundleRevision revision)
+ {
+ // Determine if we've already calculated this revision's candidates.
+ // The result cache will have one of three values:
+ // 1. A resolve exception if we've already attempted to populate the
+ // revision's candidates but were unsuccessful.
+ // 2. Boolean.TRUE indicating we've already attempted to populate the
+ // revision's candidates and were successful.
+ // 3. An array containing the cycle count, current map of candidates
+ // for already processed requirements, and a list of remaining
+ // requirements whose candidates still need to be calculated.
+ // For case 1, rethrow the exception. For case 2, simply return immediately.
+ // For case 3, this means we have a cycle so we should continue to populate
+ // the candidates where we left off and not record any results globally
+ // until we've popped completely out of the cycle.
+
+ // Keeps track of the number of times we've reentered this method
+ // for the current revision.
+ Integer cycleCount = null;
+
+ // Keeps track of the candidates we've already calculated for the
+ // current revision's requirements.
+ Map<BundleRequirement, SortedSet<BundleCapability>> localCandidateMap = null;
+
+ // Keeps track of the current revision's requirements for which we
+ // haven't yet found candidates.
+ List<BundleRequirement> remainingReqs = null;
+
+ // Get the cache value for the current revision.
+ Object cacheValue = m_populateResultCache.get(revision);
+
+ // This is case 1.
+ if (cacheValue instanceof ResolveException)
+ {
+ throw (ResolveException) cacheValue;
+ }
+ // This is case 2.
+ else if (cacheValue instanceof Boolean)
+ {
+ return;
+ }
+ // This is case 3.
+ else if (cacheValue != null)
+ {
+ // Increment and get the cycle count.
+ cycleCount = (Integer)
+ (((Object[]) cacheValue)[0]
+ = new Integer(((Integer) ((Object[]) cacheValue)[0]).intValue() + 1));
+ // Get the already populated candidates.
+ localCandidateMap = (Map) ((Object[]) cacheValue)[1];
+ // Get the remaining requirements.
+ remainingReqs = (List) ((Object[]) cacheValue)[2];
+ }
+
+ // If there is no cache value for the current revision, then this is
+ // the first time we are attempting to populate its candidates, so
+ // do some one-time checks and initialization.
+ if ((remainingReqs == null) && (localCandidateMap == null))
+ {
+ // Verify that any required execution environment is satisfied.
+ state.checkExecutionEnvironment(revision);
+
+ // Verify that any native libraries match the current platform.
+ state.checkNativeLibraries(revision);
+
+ // Record cycle count.
+ cycleCount = new Integer(0);
+
+ // Create a local map for populating candidates first, just in case
+ // the revision is not resolvable.
+ localCandidateMap = new HashMap();
+
+ // Create a modifiable list of the revision's requirements.
+ remainingReqs = new ArrayList(revision.getDeclaredRequirements(null));
+
+ // Add these value to the result cache so we know we are
+ // in the middle of populating candidates for the current
+ // revision.
+ m_populateResultCache.put(revision,
+ cacheValue = new Object[] { cycleCount, localCandidateMap, remainingReqs });
+ }
+
+ // If we have requirements remaining, then find candidates for them.
+ while (remainingReqs.size() > 0)
+ {
+ BundleRequirement req = remainingReqs.remove(0);
+
+ // Ignore non-effective and dynamic requirements.
+ String resolution = req.getDirectives().get(Constants.RESOLUTION_DIRECTIVE);
+ if (!state.isEffective(req)
+ || ((resolution != null)
+ && resolution.equals(FelixConstants.RESOLUTION_DYNAMIC)))
+ {
+ continue;
+ }
+
+ // Get satisfying candidates and populate their candidates if necessary.
+ ResolveException rethrow = null;
+ SortedSet<BundleCapability> candidates =
+ state.getCandidates((BundleRequirementImpl) req, true);
+ Set<BundleCapability> fragmentCands = null;
+ for (Iterator<BundleCapability> itCandCap = candidates.iterator();
+ itCandCap.hasNext(); )
+ {
+ BundleCapability candCap = itCandCap.next();
+
+ boolean isFragment = Util.isFragment(candCap.getRevision());
+
+ // If the capability is from a fragment, then record it
+ // because we have to insert associated host capabilities
+ // if the fragment is already attached to any hosts.
+ if (isFragment)
+ {
+ if (fragmentCands == null)
+ {
+ fragmentCands = new HashSet<BundleCapability>();
+ }
+ fragmentCands.add(candCap);
+ }
+
+ // If the candidate revision is a fragment, then always attempt
+ // to populate candidates for its dependency, since it must be
+ // attached to a host to be used. Otherwise, if the candidate
+ // revision is not already resolved and is not the current version
+ // we are trying to populate, then populate the candidates for
+ // its dependencies as well.
+ // NOTE: Technically, we don't have to check to see if the
+ // candidate revision is equal to the current revision, but this
+ // saves us from recursing and also simplifies exceptions messages
+ // since we effectively chain exception messages for each level
+ // of recursion; thus, any avoided recursion results in fewer
+ // exceptions to chain when an error does occur.
+ if (isFragment
+ || ((candCap.getRevision().getWiring() == null)
+ && !candCap.getRevision().equals(revision)))
+ {
+ try
+ {
+ populateRevision(state, candCap.getRevision());
+ }
+ catch (ResolveException ex)
+ {
+ if (rethrow == null)
+ {
+ rethrow = ex;
+ }
+ // Remove the candidate since we weren't able to
+ // populate its candidates.
+ itCandCap.remove();
+ }
+ }
+ }
+
+ // If any of the candidates for the requirement were from a fragment,
+ // then also insert synthesized hosted capabilities for any other host
+ // to which the fragment is attached since they are all effectively
+ // unique capabilities.
+ if (fragmentCands != null)
+ {
+ for (BundleCapability fragCand : fragmentCands)
+ {
+ // Only necessary for resolved fragments.
+ BundleWiring wiring = fragCand.getRevision().getWiring();
+ if (wiring != null)
+ {
+ // Fragments only have host wire, so each wire represents
+ // an attached host.
+ for (BundleWire wire : wiring.getRequiredWires(null))
+ {
+ // If the capability is a package, then make sure the
+ // host actually provides it in its resolved capabilities,
+ // since it may be a substitutable export.
+ if (!fragCand.getNamespace().equals(BundleRevision.PACKAGE_NAMESPACE)
+ || wire.getProviderWiring().getCapabilities(null).contains(fragCand))
+ {
+ // Note that we can just add this as a candidate
+ // directly, since we know it is already resolved.
+ candidates.add(
+ new HostedCapability(
+ wire.getCapability().getRevision(),
+ (BundleCapabilityImpl) fragCand));
+ }
+ }
+ }
+ }
+ }
+
+ // If there are no candidates for the current requirement
+ // and it is not optional, then create, cache, and throw
+ // a resolve exception.
+ if (candidates.isEmpty() && !((BundleRequirementImpl) req).isOptional())
+ {
+ String msg = "Unable to resolve " + revision
+ + ": missing requirement " + req;
+ if (rethrow != null)
+ {
+ msg = msg + " [caused by: " + rethrow.getMessage() + "]";
+ }
+ rethrow = new ResolveException(msg, revision, req);
+ m_populateResultCache.put(revision, rethrow);
+ throw rethrow;
+ }
+ // If we actually have candidates for the requirement, then
+ // add them to the local candidate map.
+ else if (candidates.size() > 0)
+ {
+ localCandidateMap.put(req, candidates);
+ }
+ }
+
+ // If we are exiting from a cycle then decrement
+ // cycle counter, otherwise record the result.
+ if (cycleCount.intValue() > 0)
+ {
+ ((Object[]) cacheValue)[0] = new Integer(cycleCount.intValue() - 1);
+ }
+ else if (cycleCount.intValue() == 0)
+ {
+ // Record invoved revision.
+ m_involvedRevisions.add(revision);
+
+ // Record that the revision was successfully populated.
+ m_populateResultCache.put(revision, Boolean.TRUE);
+
+ // Merge local candidate map into global candidate map.
+ if (localCandidateMap.size() > 0)
+ {
+ add(localCandidateMap);
+ }
+ }
+ }
+
+ private boolean populateFragment(ResolverState state, BundleRevision revision)
+ throws ResolveException
+ {
+ // Create a modifiable list of the revision's requirements.
+ List<BundleRequirement> remainingReqs =
+ new ArrayList(revision.getDeclaredRequirements(null));
+ // Find the host requirement.
+ BundleRequirement hostReq = null;
+ for (Iterator<BundleRequirement> it = remainingReqs.iterator();
+ it.hasNext(); )
+ {
+ BundleRequirement r = it.next();
+ if (r.getNamespace().equals(BundleRevision.HOST_NAMESPACE))
+ {
+ hostReq = r;
+ it.remove();
+ break;
+ }
+ }
+ // Get candidates hosts and keep any that have been populated.
+ SortedSet<BundleCapability> hosts =
+ state.getCandidates((BundleRequirementImpl) hostReq, false);
+ for (Iterator<BundleCapability> it = hosts.iterator(); it.hasNext(); )
+ {
+ BundleCapability host = it.next();
+ if (!isPopulated(host.getRevision()))
+ {
+ it.remove();
+ }
+ }
+ // If there aren't any populated hosts, then we can just
+ // return since this fragment isn't needed.
+ if (hosts.isEmpty())
+ {
+ return false;
+ }
+ // If there are populates host candidates, then finish up
+ // some other checks and prepopulate the result cache with
+ // the work we've done so far.
+ // Verify that any required execution environment is satisfied.
+ state.checkExecutionEnvironment(revision);
+ // Verify that any native libraries match the current platform.
+ state.checkNativeLibraries(revision);
+ // Record cycle count, but start at -1 since it will
+ // be incremented again in populate().
+ Integer cycleCount = new Integer(-1);
+ // Create a local map for populating candidates first, just in case
+ // the revision is not resolvable.
+ Map<BundleRequirement, SortedSet<BundleCapability>> localCandidateMap =
+ new HashMap<BundleRequirement, SortedSet<BundleCapability>>();
+ // Add the discovered host candidates to the local candidate map.
+ localCandidateMap.put(hostReq, hosts);
+ // Add these value to the result cache so we know we are
+ // in the middle of populating candidates for the current
+ // revision.
+ m_populateResultCache.put(revision,
+ new Object[] { cycleCount, localCandidateMap, remainingReqs });
+ return true;
+ }
+
+ public boolean isPopulated(BundleRevision revision)
+ {
+ Object value = m_populateResultCache.get(revision);
+ return ((value != null) && (value instanceof Boolean));
+ }
+
+ public ResolveException getResolveException(BundleRevision revision)
+ {
+ Object value = m_populateResultCache.get(revision);
+ return ((value != null) && (value instanceof ResolveException))
+ ? (ResolveException) value : null;
+ }
+
+ public void populateDynamic(
+ ResolverState state, BundleRevision revision,
+ BundleRequirement req, SortedSet<BundleCapability> candidates)
+ {
+ // Record the revision associated with the dynamic require
+ // as a mandatory revision.
+ m_mandatoryRevisions.add(revision);
+
+ // Add the dynamic imports candidates.
+ add(req, candidates);
+
+ // Populate the candidates for the dynamic import.
+ ResolveException rethrow = null;
+ for (Iterator<BundleCapability> itCandCap = candidates.iterator();
+ itCandCap.hasNext(); )
+ {
+ BundleCapability candCap = itCandCap.next();
+ if (candCap.getRevision().getWiring() == null)
+ {
+ try
+ {
+ populateRevision(state, candCap.getRevision());
+ }
+ catch (ResolveException ex)
+ {
+ if (rethrow == null)
+ {
+ rethrow = ex;
+ }
+ itCandCap.remove();
+ }
+ }
+ }
+
+ if (candidates.isEmpty())
+ {
+ if (rethrow == null)
+ {
+ rethrow = new ResolveException("Dynamic import failed.", revision, req);
+ }
+ throw rethrow;
+ }
+
+ m_populateResultCache.put(revision, Boolean.TRUE);
+ }
+
+ /**
+ * Adds a requirement and its matching candidates to the internal data
+ * structure. This method assumes it owns the data being passed in and
+ * does not make a copy. It takes the data and processes, such as calculating
+ * which requirements depend on which capabilities and recording any fragments
+ * it finds for future merging.
+ * @param req the requirement to add.
+ * @param candidates the candidates matching the requirement.
+ **/
+ private void add(BundleRequirement req, SortedSet<BundleCapability> candidates)
+ {
+ if (req.getNamespace().equals(BundleRevision.HOST_NAMESPACE))
+ {
+ m_fragmentsPresent = true;
+ }
+
+ // Record the candidates.
+ m_candidateMap.put(req, candidates);
+ }
+
+ /**
+ * Adds requirements and candidates in bulk. The outer map is not retained
+ * by this method, but the inner data structures are, so they should not
+ * be further modified by the caller.
+ * @param candidates the bulk requirements and candidates to add.
+ **/
+ private void add(Map<BundleRequirement, SortedSet<BundleCapability>> candidates)
+ {
+ for (Entry<BundleRequirement, SortedSet<BundleCapability>> entry : candidates.entrySet())
+ {
+ add(entry.getKey(), entry.getValue());
+ }
+ }
+
+ /**
+ * Returns the wrapped module associated with the given module. If the module
+ * was not wrapped, then the module itself is returned. This is really only
+ * needed to determine if the root modules of the resolve have been wrapped.
+ * @param m the module whose wrapper is desired.
+ * @return the wrapper module or the module itself if it was not wrapped.
+ **/
+ public BundleRevision getWrappedHost(BundleRevision m)
+ {
+ BundleRevision wrapped = m_allWrappedHosts.get(m);
+ return (wrapped == null) ? m : wrapped;
+ }
+
+ /**
+ * Gets the candidates associated with a given requirement.
+ * @param req the requirement whose candidates are desired.
+ * @return the matching candidates or null.
+ **/
+ public SortedSet<BundleCapability> getCandidates(BundleRequirement req)
+ {
+ return m_candidateMap.get(req);
+ }
+
+ /**
+ * Merges fragments into their hosts. It does this by wrapping all host
+ * modules and attaching their selected fragments, removing all unselected
+ * fragment modules, and replacing all occurrences of the original fragments
+ * in the internal data structures with the wrapped host modules instead.
+ * Thus, fragment capabilities and requirements are merged into the appropriate
+ * host and the candidates for the fragment now become candidates for the host.
+ * Likewise, any module depending on a fragment now depend on the host. Note
+ * that this process is sort of like multiplication, since one fragment that
+ * can attach to two hosts effectively gets multiplied across the two hosts.
+ * So, any modules being satisfied by the fragment will end up having the
+ * two hosts as potential candidates, rather than the single fragment.
+ * @param existingSingletons existing resolved singletons.
+ * @throws ResolveException if the removal of any unselected fragments result
+ * in the root module being unable to resolve.
+ **/
+ public void prepare(List<BundleRevision> existingSingletons)
+ {
+ boolean init = false;
+
+ if (m_fragmentsPresent)
+ {
+ populateDependents();
+ init = true;
+ }
+
+ final Map<String, BundleRevision> singletons = new HashMap<String, BundleRevision>();
+
+ for (Iterator<BundleRevision> it = m_involvedRevisions.iterator(); it.hasNext(); )
+ {
+ BundleRevision br = it.next();
+ if (isSingleton(br))
+ {
+ if (!init)
+ {
+ populateDependents();
+ init = true;
+ }
+
+ // See if there is an existing singleton for the
+ // revision's symbolic name.
+ BundleRevision singleton = singletons.get(br.getSymbolicName());
+ // If there is no existing singleton or this revision is
+ // a resolved singleton or this revision has a higher version
+ // and the existing singleton is not resolved, then select
+ // this revision as the singleton.
+ if ((singleton == null)
+ || (br.getWiring() != null)
+ || ((br.getVersion().compareTo(singleton.getVersion()) > 0)
+ && (singleton.getWiring() == null)))
+ {
+ singletons.put(br.getSymbolicName(), br);
+ // Remove the singleton revision from the candidates
+ // if it wasn't selected.
+ if (singleton != null)
+ {
+ removeRevision(
+ singleton,
+ new ResolveException(
+ "Conflict with another singleton.", singleton, null));
+ }
+ }
+ else
+ {
+ removeRevision(br,
+ new ResolveException(
+ "Conflict with another singleton.", br, null));
+ }
+ }
+ }
+
+ // If the root is a singleton, then prefer it over any other singleton.
+// TODO: OSGi R4.3/SINGLETON - How do we prefer the root as a singleton?
+/*
+ if ((m_root != null) && isSingleton(m_root))
+ {
+ BundleRevision singleton = singletons.get(m_root.getSymbolicName());
+ singletons.put(m_root.getSymbolicName(), m_root);
+ if ((singleton != null) && !singleton.equals(m_root))
+ {
+ if (singleton.getWiring() != null)
+ {
+ throw new ResolveException(
+ "Cannot resolve singleton "
+ + m_root
+ + " because "
+ + singleton
+ + " singleton is already resolved.",
+ m_root, null);
+ }
+ removeRevision(singleton);
+ }
+ }
+*/
+
+ // Make sure selected singletons do not conflict with existing
+ // singletons passed into this method.
+ for (int i = 0; (existingSingletons != null) && (i < existingSingletons.size()); i++)
+ {
+ BundleRevision existing = existingSingletons.get(i);
+ BundleRevision singleton = singletons.get(existing.getSymbolicName());
+ if ((singleton != null) && (singleton != existing))
+ {
+ singletons.remove(singleton.getSymbolicName());
+ removeRevision(singleton,
+ new ResolveException(
+ "Conflict with another singleton.", singleton, null));
+ }
+ }
+
+ // This method performs the following steps:
+ // 1. Select the fragments to attach to a given host.
+ // 2. Wrap hosts and attach fragments.
+ // 3. Remove any unselected fragments. This is necessary because
+ // other revisions may depend on the capabilities of unselected
+ // fragments, so we need to remove the unselected fragments and
+ // any revisions that depends on them, which could ultimately cause
+ // the entire resolve to fail.
+ // 4. Replace all fragments with any host it was merged into
+ // (effectively multiplying it).
+ // * This includes setting candidates for attached fragment
+ // requirements as well as replacing fragment capabilities
+ // with host's attached fragment capabilities.
+
+ // Steps 1 and 2
+ List<HostBundleRevision> hostRevisions = new ArrayList<HostBundleRevision>();
+ List<BundleRevision> unselectedFragments = new ArrayList<BundleRevision>();
+ for (Entry<BundleCapability, Map<String, Map<Version, List<BundleRequirement>>>>
+ hostEntry : m_hostFragments.entrySet())
+ {
+ // Step 1
+ BundleCapability hostCap = hostEntry.getKey();
+ Map<String, Map<Version, List<BundleRequirement>>> fragments
+ = hostEntry.getValue();
+ List<BundleRevision> selectedFragments = new ArrayList<BundleRevision>();
+ for (Entry<String, Map<Version, List<BundleRequirement>>> fragEntry
+ : fragments.entrySet())
+ {
+ boolean isFirst = true;
+ for (Entry<Version, List<BundleRequirement>> versionEntry
+ : fragEntry.getValue().entrySet())
+ {
+ for (BundleRequirement hostReq : versionEntry.getValue())
+ {
+ // Select the highest version of the fragment that
+ // is not removal pending.
+ if (isFirst
+ ) // TODO: karl - is this correct? && !((BundleRevisionImpl) hostReq.getRevision()).isRemovalPending())
+ {
+ selectedFragments.add(hostReq.getRevision());
+ isFirst = false;
+ }
+ // For any fragment that wasn't selected, remove the
+ // current host as a potential host for it and remove it
+ // as a dependent on the host. If there are no more
+ // potential hosts for the fragment, then mark it as
+ // unselected for later removal.
+ else
+ {
+ m_dependentMap.get(hostCap).remove(hostReq);
+ SortedSet<BundleCapability> hosts = m_candidateMap.get(hostReq);
+ hosts.remove(hostCap);
+ if (hosts.isEmpty())
+ {
+ unselectedFragments.add(hostReq.getRevision());
+ }
+ }
+ }
+ }
+ }
+
+ // Step 2
+ HostBundleRevision wrappedHost =
+ new HostBundleRevision(hostCap.getRevision(), selectedFragments);
+ hostRevisions.add(wrappedHost);
+ m_allWrappedHosts.put(hostCap.getRevision(), wrappedHost);
+ }
+
+ // Step 3
+ for (BundleRevision br : unselectedFragments)
+ {
+ removeRevision(br,
+ new ResolveException(
+ "Fragment was not selected for attachment.", br, null));
+ }
+
+ // Step 4
+ for (HostBundleRevision hostRevision : hostRevisions)
+ {
+ // Replaces capabilities from fragments with the capabilities
+ // from the merged host.
+ for (BundleCapability c : hostRevision.getDeclaredCapabilities(null))
+ {
+ // Don't replace the host capability, since the fragment will
+ // really be attached to the original host, not the wrapper.
+ if (!c.getNamespace().equals(BundleRevision.HOST_NAMESPACE))
+ {
+ BundleCapability origCap =
+ ((HostedCapability) c).getOriginalCapability();
+ // Note that you might think we could remove the original cap
+ // from the dependent map, but you can't since it may come from
+ // a fragment that is attached to multiple hosts, so each host
+ // will need to make their own copy.
+ Set<BundleRequirement> dependents = m_dependentMap.get(origCap);
+ if (dependents != null)
+ {
+ dependents = new HashSet<BundleRequirement>(dependents);
+ m_dependentMap.put(c, dependents);
+ for (BundleRequirement r : dependents)
+ {
+ Set<BundleCapability> cands = m_candidateMap.get(r);
+ cands.remove(origCap);
+ cands.add(c);
+ }
+ }
+ }
+ }
+
+ // Copy candidates for fragment requirements to the host.
+ for (BundleRequirement r : hostRevision.getDeclaredRequirements(null))
+ {
+ BundleRequirement origReq =
+ ((HostedRequirement) r).getOriginalRequirement();
+ SortedSet<BundleCapability> cands = m_candidateMap.get(origReq);
+ if (cands != null)
+ {
+ m_candidateMap.put(r, new TreeSet<BundleCapability>(cands));
+ for (BundleCapability cand : cands)
+ {
+ Set<BundleRequirement> dependents = m_dependentMap.get(cand);
+ dependents.remove(origReq);
+ dependents.add(r);
+ }
+ }
+ }
+ }
+
+ // Lastly, verify that all mandatory revisions are still
+ // populated, since some might have become unresolved after
+ // selecting fragments/singletons.
+ for (BundleRevision br : m_mandatoryRevisions)
+ {
+ if (!isPopulated(br))
+ {
+ throw getResolveException(br);
+ }
+ }
+ }
+
+ private void populateDependents()
+ {
+ for (Entry<BundleRequirement, SortedSet<BundleCapability>> entry
+ : m_candidateMap.entrySet())
+ {
+ BundleRequirement req = entry.getKey();
+ SortedSet<BundleCapability> caps = entry.getValue();
+ for (BundleCapability cap : caps)
+ {
+ // Record the requirement as dependent on the capability.
+ Set<BundleRequirement> dependents = m_dependentMap.get(cap);
+ if (dependents == null)
+ {
+ dependents = new HashSet<BundleRequirement>();
+ m_dependentMap.put(cap, dependents);
+ }
+ dependents.add(req);
+
+ // Keep track of hosts and associated fragments.
+ if (req.getNamespace().equals(BundleRevision.HOST_NAMESPACE))
+ {
+ Map<String, Map<Version, List<BundleRequirement>>>
+ fragments = m_hostFragments.get(cap);
+ if (fragments == null)
+ {
+ fragments = new HashMap<String, Map<Version, List<BundleRequirement>>>();
+ m_hostFragments.put(cap, fragments);
+ }
+ Map<Version, List<BundleRequirement>> fragmentVersions =
+ fragments.get(req.getRevision().getSymbolicName());
+ if (fragmentVersions == null)
+ {
+ fragmentVersions =
+ new TreeMap<Version, List<BundleRequirement>>(Collections.reverseOrder());
+ fragments.put(req.getRevision().getSymbolicName(), fragmentVersions);
+ }
+ List<BundleRequirement> actual = fragmentVersions.get(req.getRevision().getVersion());
+ if (actual == null)
+ {
+ actual = new ArrayList<BundleRequirement>();
+ fragmentVersions.put(req.getRevision().getVersion(), actual);
+ }
+ actual.add(req);
+ }
+ }
+ }
+ }
+
+ /**
+ * Removes a module from the internal data structures if it wasn't selected
+ * as a fragment or a singleton. This process may cause other modules to
+ * become unresolved if they depended on the module's capabilities and there
+ * is no other candidate.
+ * @param revision the module to remove.
+ * @throws ResolveException if removing the module caused the resolve to fail.
+ **/
+ private void removeRevision(BundleRevision revision, ResolveException ex)
+ {
+ // Add removal reason to result cache.
+ m_populateResultCache.put(revision, ex);
+ // Remove from dependents.
+ Set<BundleRevision> unresolvedRevisions = new HashSet<BundleRevision>();
+ remove(revision, unresolvedRevisions);
+ // Remove dependents that failed as a result of removing revision.
+ while (!unresolvedRevisions.isEmpty())
+ {
+ Iterator<BundleRevision> it = unresolvedRevisions.iterator();
+ revision = it.next();
+ it.remove();
+ remove(revision, unresolvedRevisions);
+ }
+ }
+
+ /**
+ * Removes the specified module from the internal data structures, which
+ * involves removing its requirements and its capabilities. This may cause
+ * other modules to become unresolved as a result.
+ * @param br the module to remove.
+ * @param unresolvedRevisions a list to containing any additional modules that
+ * that became unresolved as a result of removing this module and will
+ * also need to be removed.
+ * @throws ResolveException if removing the module caused the resolve to fail.
+ **/
+ private void remove(BundleRevision br, Set<BundleRevision> unresolvedRevisions)
+ throws ResolveException
+ {
+ for (BundleRequirement r : br.getDeclaredRequirements(null))
+ {
+ remove(r);
+ }
+
+ for (BundleCapability c : br.getDeclaredCapabilities(null))
+ {
+ remove(c, unresolvedRevisions);
+ }
+ }
+
+ /**
+ * Removes a requirement from the internal data structures.
+ * @param req the requirement to remove.
+ **/
+ private void remove(BundleRequirement req)
+ {
+ boolean isFragment = req.getNamespace().equals(BundleRevision.HOST_NAMESPACE);
+
+ SortedSet<BundleCapability> candidates = m_candidateMap.remove(req);
+ if (candidates != null)
+ {
+ for (BundleCapability cap : candidates)
+ {
+ Set<BundleRequirement> dependents = m_dependentMap.get(cap);
+ if (dependents != null)
+ {
+ dependents.remove(req);
+ }
+
+ if (isFragment)
+ {
+ Map<String, Map<Version, List<BundleRequirement>>>
+ fragments = m_hostFragments.get(cap);
+ if (fragments != null)
+ {
+ Map<Version, List<BundleRequirement>> fragmentVersions =
+ fragments.get(req.getRevision().getSymbolicName());
+ if (fragmentVersions != null)
+ {
+ List<BundleRequirement> actual =
+ fragmentVersions.get(req.getRevision().getVersion());
+ if (actual != null)
+ {
+ actual.remove(req);
+ if (actual.isEmpty())
+ {
+ fragmentVersions.remove(req.getRevision().getVersion());
+ if (fragmentVersions.isEmpty())
+ {
+ fragments.remove(req.getRevision().getSymbolicName());
+ if (fragments.isEmpty())
+ {
+ m_hostFragments.remove(cap);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Removes a capability from the internal data structures. This may cause
+ * other modules to become unresolved as a result.
+ * @param c the capability to remove.
+ * @param unresolvedRevisions a list to containing any additional modules that
+ * that became unresolved as a result of removing this module and will
+ * also need to be removed.
+ * @throws ResolveException if removing the module caused the resolve to fail.
+ **/
+ private void remove(BundleCapability c, Set<BundleRevision> unresolvedRevisions)
+ throws ResolveException
+ {
+ Set<BundleRequirement> dependents = m_dependentMap.remove(c);
+ if (dependents != null)
+ {
+ for (BundleRequirement r : dependents)
+ {
+ SortedSet<BundleCapability> candidates = m_candidateMap.get(r);
+ candidates.remove(c);
+ if (candidates.isEmpty())
+ {
+ m_candidateMap.remove(r);
+ if (!((BundleRequirementImpl) r).isOptional())
+ {
+ String msg = "Unable to resolve " + r.getRevision()
+ + ": missing requirement " + r;
+ m_populateResultCache.put(
+ r.getRevision(), new ResolveException(msg, r.getRevision(), r));
+ unresolvedRevisions.add(r.getRevision());
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Creates a copy of the Candidates object. This is used for creating
+ * permutations when package space conflicts are discovered.
+ * @return copy of this Candidates object.
+ **/
+ public Candidates copy()
+ {
+ Map<BundleCapability, Set<BundleRequirement>> dependentMap =
+ new HashMap<BundleCapability, Set<BundleRequirement>>();
+ for (Entry<BundleCapability, Set<BundleRequirement>> entry : m_dependentMap.entrySet())
+ {
+ Set<BundleRequirement> dependents = new HashSet<BundleRequirement>(entry.getValue());
+ dependentMap.put(entry.getKey(), dependents);
+ }
+
+ Map<BundleRequirement, SortedSet<BundleCapability>> candidateMap =
+ new HashMap<BundleRequirement, SortedSet<BundleCapability>>();
+ for (Entry<BundleRequirement, SortedSet<BundleCapability>> entry
+ : m_candidateMap.entrySet())
+ {
+ SortedSet<BundleCapability> candidates =
+ new TreeSet<BundleCapability>(entry.getValue());
+ candidateMap.put(entry.getKey(), candidates);
+ }
+
+ return new Candidates(
+ m_mandatoryRevisions, m_involvedRevisions, dependentMap, candidateMap,
+ m_hostFragments, m_allWrappedHosts, m_populateResultCache,
+ m_fragmentsPresent);
+ }
+
+ public void dump()
+ {
+ // Create set of all revisions from requirements.
+ Set<BundleRevision> revisions = new HashSet<BundleRevision>();
+ for (Entry<BundleRequirement, SortedSet<BundleCapability>> entry
+ : m_candidateMap.entrySet())
+ {
+ revisions.add(entry.getKey().getRevision());
+ }
+ // Now dump the revisions.
+ System.out.println("=== BEGIN CANDIDATE MAP ===");
+ for (BundleRevision br : revisions)
+ {
+ System.out.println(" " + br
+ + " (" + ((br.getWiring() != null) ? "RESOLVED)" : "UNRESOLVED)"));
+ List<BundleRequirement> reqs = (br.getWiring() != null)
+ ? br.getWiring().getRequirements(null)
+ : br.getDeclaredRequirements(null);
+ for (BundleRequirement req : reqs)
+ {
+ Set<BundleCapability> candidates = m_candidateMap.get(req);
+ if ((candidates != null) && (candidates.size() > 0))
+ {
+ System.out.println(" " + req + ": " + candidates);
+ }
+ }
+ reqs = (br.getWiring() != null)
+ ? Util.getDynamicRequirements(br.getWiring().getRequirements(null))
+ : Util.getDynamicRequirements(br.getDeclaredRequirements(null));
+ for (BundleRequirement req : reqs)
+ {
+ Set<BundleCapability> candidates = m_candidateMap.get(req);
+ if ((candidates != null) && (candidates.size() > 0))
+ {
+ System.out.println(" " + req + ": " + candidates);
+ }
+ }
+ }
+ System.out.println("=== END CANDIDATE MAP ===");
+ }
+
+ /**
+ * Returns true if the specified module is a singleton
+ * (i.e., directive singleton:=true).
+ *
+ * @param revision the module to check for singleton status.
+ * @return true if the module is a singleton, false otherwise.
+ **/
+ private static boolean isSingleton(BundleRevision revision)
+ {
+ final List<BundleCapability> modCaps =
+ Util.getCapabilityByNamespace(
+ revision, BundleRevision.BUNDLE_NAMESPACE);
+ if (modCaps == null || modCaps.isEmpty())
+ {
+ return false;
+ }
+ String value = modCaps.get(0).getDirectives().get(Constants.SINGLETON_DIRECTIVE);
+ if (value != null)
+ {
+ return Boolean.valueOf(value);
+ }
+ return false;
+ }
+}
Added: incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/HostBundleRevision.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/HostBundleRevision.java?rev=1170188&view=auto
==============================================================================
--- incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/HostBundleRevision.java (added)
+++ incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/HostBundleRevision.java Tue Sep 13 14:06:20 2011
@@ -0,0 +1,146 @@
+/*
+ * 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.framework.resolver;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.apache.felix.framework.wiring.BundleCapabilityImpl;
+import org.apache.felix.framework.wiring.BundleRequirementImpl;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.Version;
+import org.osgi.framework.wiring.BundleCapability;
+import org.osgi.framework.wiring.BundleRequirement;
+import org.osgi.framework.wiring.BundleRevision;
+import org.osgi.framework.wiring.BundleWiring;
+
+class HostBundleRevision implements BundleRevision
+{
+ private final BundleRevision m_host;
+ private final List<BundleRevision> m_fragments;
+ private List<BundleCapability> m_cachedCapabilities = null;
+ private List<BundleRequirement> m_cachedRequirements = null;
+
+ public HostBundleRevision(BundleRevision host, List<BundleRevision> fragments)
+ {
+ m_host = host;
+ m_fragments = fragments;
+ }
+
+ public BundleRevision getHost()
+ {
+ return m_host;
+ }
+
+ public List<BundleRevision> getFragments()
+ {
+ return m_fragments;
+ }
+
+ public String getSymbolicName()
+ {
+ return m_host.getSymbolicName();
+ }
+
+ public Version getVersion()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public List<BundleCapability> getDeclaredCapabilities(String namespace)
+ {
+ if (m_cachedCapabilities == null)
+ {
+ List<BundleCapability> caps = new ArrayList<BundleCapability>();
+
+ // Wrap host capabilities.
+ for (BundleCapability cap : m_host.getDeclaredCapabilities(null))
+ {
+ caps.add(new HostedCapability(this, (BundleCapabilityImpl) cap));
+ }
+
+ // Wrap fragment capabilities.
+ if (m_fragments != null)
+ {
+ for (BundleRevision fragment : m_fragments)
+ {
+ for (BundleCapability cap : fragment.getDeclaredCapabilities(null))
+ {
+// TODO: OSGi R4.4 - OSGi R4.4 may introduce an identity capability, if so
+// that will need to be excluded from here.
+ caps.add(new HostedCapability(this, (BundleCapabilityImpl) cap));
+ }
+ }
+ }
+ m_cachedCapabilities = Collections.unmodifiableList(caps);
+ }
+ return m_cachedCapabilities;
+ }
+
+ public List<BundleRequirement> getDeclaredRequirements(String namespace)
+ {
+ if (m_cachedRequirements == null)
+ {
+ List<BundleRequirement> reqs = new ArrayList<BundleRequirement>();
+
+ // Wrap host requirements.
+ for (BundleRequirement req : m_host.getDeclaredRequirements(null))
+ {
+ reqs.add(new HostedRequirement(this, (BundleRequirementImpl) req));
+ }
+
+ // Wrap fragment requirements.
+ if (m_fragments != null)
+ {
+ for (BundleRevision fragment : m_fragments)
+ {
+ for (BundleRequirement req : fragment.getDeclaredRequirements(null))
+ {
+ if (!req.getNamespace().equals(BundleRevision.HOST_NAMESPACE))
+ {
+ reqs.add(new HostedRequirement(this, (BundleRequirementImpl) req));
+ }
+ }
+ }
+ }
+ m_cachedRequirements = Collections.unmodifiableList(reqs);
+ }
+ return m_cachedRequirements;
+ }
+
+ public int getTypes()
+ {
+ return m_host.getTypes();
+ }
+
+ public BundleWiring getWiring()
+ {
+ return null;
+ }
+
+ public Bundle getBundle()
+ {
+ return m_host.getBundle();
+ }
+
+ public String toString()
+ {
+ return m_host.toString();
+ }
+}
\ No newline at end of file
Added: incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/HostedCapability.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/HostedCapability.java?rev=1170188&view=auto
==============================================================================
--- incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/HostedCapability.java (added)
+++ incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/HostedCapability.java Tue Sep 13 14:06:20 2011
@@ -0,0 +1,122 @@
+/*
+ * 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.framework.resolver;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.felix.framework.wiring.BundleCapabilityImpl;
+import org.osgi.framework.wiring.BundleCapability;
+import org.osgi.framework.wiring.BundleRevision;
+
+public class HostedCapability extends BundleCapabilityImpl
+{
+ private final BundleRevision m_host;
+ private final BundleCapabilityImpl m_cap;
+
+ public HostedCapability(BundleRevision host, BundleCapabilityImpl cap)
+ {
+ super(host, cap.getNamespace(), cap.getDirectives(), cap.getAttributes());
+ m_host = host;
+ m_cap = cap;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj == null)
+ {
+ return false;
+ }
+ if (getClass() != obj.getClass())
+ {
+ return false;
+ }
+ final HostedCapability other = (HostedCapability) obj;
+ if (m_host != other.m_host && (m_host == null || !m_host.equals(other.m_host)))
+ {
+ return false;
+ }
+ if (m_cap != other.m_cap && (m_cap == null || !m_cap.equals(other.m_cap)))
+ {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int hash = 7;
+ hash = 37 * hash + (m_host != null ? m_host.hashCode() : 0);
+ hash = 37 * hash + (m_cap != null ? m_cap.hashCode() : 0);
+ return hash;
+ }
+
+ public BundleCapabilityImpl getOriginalCapability()
+ {
+ return m_cap;
+ }
+
+ @Override
+ public BundleRevision getRevision()
+ {
+ return m_host;
+ }
+
+ @Override
+ public String getNamespace()
+ {
+ return m_cap.getNamespace();
+ }
+
+ @Override
+ public Map<String, String> getDirectives()
+ {
+ return m_cap.getDirectives();
+ }
+
+ @Override
+ public Map<String, Object> getAttributes()
+ {
+ return m_cap.getAttributes();
+ }
+
+ @Override
+ public List<String> getUses()
+ {
+ return m_cap.getUses();
+ }
+
+ @Override
+ public String toString()
+ {
+ if (m_host == null)
+ {
+ return getAttributes().toString();
+ }
+ if (getNamespace().equals(BundleRevision.PACKAGE_NAMESPACE))
+ {
+ return "[" + m_host + "] "
+ + getNamespace()
+ + "; "
+ + getAttributes().get(BundleRevision.PACKAGE_NAMESPACE);
+ }
+ return "[" + m_host + "] " + getNamespace() + "; " + getAttributes();
+ }
+}
\ No newline at end of file
Added: incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/HostedRequirement.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/HostedRequirement.java?rev=1170188&view=auto
==============================================================================
--- incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/HostedRequirement.java (added)
+++ incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/HostedRequirement.java Tue Sep 13 14:06:20 2011
@@ -0,0 +1,116 @@
+/*
+ * 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.framework.resolver;
+
+import java.util.Map;
+import org.apache.felix.framework.capabilityset.SimpleFilter;
+import org.apache.felix.framework.wiring.BundleRequirementImpl;
+import org.osgi.framework.wiring.BundleRevision;
+
+public class HostedRequirement extends BundleRequirementImpl
+{
+ private final BundleRevision m_host;
+ private final BundleRequirementImpl m_req;
+
+ public HostedRequirement(BundleRevision host, BundleRequirementImpl req)
+ {
+ super(host, req.getNamespace(), req.getDirectives(), req.getAttributes());
+ m_host = host;
+ m_req = req;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj == null)
+ {
+ return false;
+ }
+ if (getClass() != obj.getClass())
+ {
+ return false;
+ }
+ final HostedRequirement other = (HostedRequirement) obj;
+ if (m_host != other.m_host && (m_host == null || !m_host.equals(other.m_host)))
+ {
+ return false;
+ }
+ if (m_req != other.m_req && (m_req == null || !m_req.equals(other.m_req)))
+ {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int hash = 7;
+ hash = 37 * hash + (m_host != null ? m_host.hashCode() : 0);
+ hash = 37 * hash + (m_req != null ? m_req.hashCode() : 0);
+ return hash;
+ }
+
+ public BundleRequirementImpl getOriginalRequirement()
+ {
+ return m_req;
+ }
+
+ @Override
+ public BundleRevision getRevision()
+ {
+ return m_host;
+ }
+
+ @Override
+ public String getNamespace()
+ {
+ return m_req.getNamespace();
+ }
+
+ @Override
+ public SimpleFilter getFilter()
+ {
+ return m_req.getFilter();
+ }
+
+ @Override
+ public boolean isOptional()
+ {
+ return m_req.isOptional();
+ }
+
+ @Override
+ public Map<String, String> getDirectives()
+ {
+ return m_req.getDirectives();
+ }
+
+ @Override
+ public Map<String, Object> getAttributes()
+ {
+ return m_req.getAttributes();
+ }
+
+ @Override
+ public String toString()
+ {
+ return "[" + m_host + "] " + getNamespace() + "; " + getFilter().toString();
+ }
+}
\ No newline at end of file
Added: incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/ResolveException.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/ResolveException.java?rev=1170188&view=auto
==============================================================================
--- incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/ResolveException.java (added)
+++ incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/ResolveException.java Tue Sep 13 14:06:20 2011
@@ -0,0 +1,49 @@
+/*
+ * 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.framework.resolver;
+
+import org.osgi.framework.wiring.BundleRequirement;
+import org.osgi.framework.wiring.BundleRevision;
+
+public class ResolveException extends RuntimeException
+{
+ private final BundleRevision m_revision;
+ private final BundleRequirement m_req;
+
+ /**
+ * Constructs an instance of <code>ResolveException</code> with the specified detail message.
+ * @param msg the detail message.
+ */
+ public ResolveException(String msg, BundleRevision revision, BundleRequirement req)
+ {
+ super(msg);
+ m_revision = revision;
+ m_req = req;
+ }
+
+ public BundleRevision getRevision()
+ {
+ return m_revision;
+ }
+
+ public BundleRequirement getRequirement()
+ {
+ return m_req;
+ }
+}
\ No newline at end of file
Propchange: incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/ResolveException.java
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/Resolver.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/Resolver.java?rev=1170188&view=auto
==============================================================================
--- incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/Resolver.java (added)
+++ incubator/ace/trunk/ace-deployment-verifier/src/main/java/org/apache/felix/framework/resolver/Resolver.java Tue Sep 13 14:06:20 2011
@@ -0,0 +1,48 @@
+/*
+ * 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.framework.resolver;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import org.osgi.framework.wiring.BundleCapability;
+import org.osgi.framework.wiring.BundleRequirement;
+import org.osgi.framework.wiring.BundleRevision;
+
+public interface Resolver
+{
+ Map<BundleRevision, List<ResolverWire>> resolve(
+ ResolverState state,
+ Set<BundleRevision> mandatoryRevisions,
+ Set<BundleRevision> optionalRevisions,
+ Set<BundleRevision> ondemandFragments);
+ Map<BundleRevision, List<ResolverWire>> resolve(
+ ResolverState state, BundleRevision revision, String pkgName,
+ Set<BundleRevision> ondemandFragments);
+
+ public static interface ResolverState
+ {
+ boolean isEffective(BundleRequirement req);
+ SortedSet<BundleCapability> getCandidates(
+ BundleRequirement req, boolean obeyMandatory);
+ void checkExecutionEnvironment(BundleRevision revision) throws ResolveException;
+ void checkNativeLibraries(BundleRevision revision) throws ResolveException;
+ }
+}
\ No newline at end of file