You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2011/05/04 18:51:28 UTC
svn commit: r1099515 [2/4] - in
/felix/sandbox/rickhall/framework-up/src/main/java/org/apache/felix/framework:
./ resolver/ util/
Modified: felix/sandbox/rickhall/framework-up/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-up/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java?rev=1099515&r1=1099514&r2=1099515&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-up/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java (original)
+++ felix/sandbox/rickhall/framework-up/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java Wed May 4 16:51:28 2011
@@ -31,7 +31,6 @@ import java.security.PrivilegedException
import java.security.ProtectionDomain;
import java.security.SecureClassLoader;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -45,8 +44,6 @@ import java.util.TreeMap;
import org.apache.felix.framework.Felix.StatefulResolver;
import org.apache.felix.framework.cache.JarContent;
import org.apache.felix.framework.resolver.Content;
-import org.apache.felix.framework.resolver.HostedCapability;
-import org.apache.felix.framework.resolver.HostedRequirement;
import org.apache.felix.framework.resolver.ResolveException;
import org.apache.felix.framework.resolver.ResolverWire;
import org.apache.felix.framework.resolver.ResourceNotFoundException;
@@ -71,7 +68,7 @@ import org.osgi.framework.wiring.BundleR
import org.osgi.framework.wiring.BundleWire;
import org.osgi.framework.wiring.BundleWiring;
-public class BundleRevisionImpl implements BundleRevision, BundleWiring
+public class BundleRevisionImpl implements BundleRevision
{
public final static int EAGER_ACTIVATION = 0;
public final static int LAZY_ACTIVATION = 1;
@@ -90,81 +87,33 @@ public class BundleRevisionImpl implemen
private final Version m_version;
private final List<BundleCapability> m_declaredCaps;
- private List<BundleCapability> m_resolvedCaps = null;
private final List<BundleRequirement> m_declaredReqs;
- private List<BundleRequirement> m_resolvedReqs = null;
- private final List<BundleRequirement> m_declaredDynReqs;
- private List<BundleRequirement> m_resolvedDynReqs = null;
- private final List<R4Library> m_nativeLibraries;
+ private final List<BundleRequirement> m_declaredDynamicReqs;
+ private final List<R4Library> m_declaredNativeLibs;
private final int m_declaredActivationPolicy;
private final List<String> m_activationIncludes;
private final List<String> m_activationExcludes;
private final Bundle m_bundle;
- private List<BundleRevision> m_fragments = null;
- private List<BundleWire> m_wires = null;
- private Map<String, BundleRevision> m_importedPkgs = null;
- private Map<String, List<BundleRevision>> m_requiredPkgs = null;
private List<BundleRevision> m_dependentImporters = new ArrayList<BundleRevision>(0);
private List<BundleRevision> m_dependentRequirers = new ArrayList<BundleRevision>(0);
- private volatile boolean m_isResolved = false;
private Content[] m_contentPath;
- private Content[] m_fragmentContents = null;
- private BundleClassLoader m_classLoader;
private boolean m_isActivationTriggered = false;
private ProtectionDomain m_protectionDomain = null;
private final static SecureAction m_secureAction = new SecureAction();
- // Bundle-specific class loader for boot delegation.
- private final ClassLoader m_bootClassLoader;
- // Default class loader for boot delegation.
- private final static ClassLoader m_defBootClassLoader;
-
- // Statically define the default class loader for boot delegation.
- static
- {
- ClassLoader cl = null;
- try
- {
- Constructor ctor = m_secureAction.getDeclaredConstructor(
- SecureClassLoader.class, new Class[] { ClassLoader.class });
- m_secureAction.setAccesssible(ctor);
- cl = (ClassLoader) m_secureAction.invoke(ctor, new Object[] { null });
- }
- catch (Throwable ex)
- {
- // On Android we get an exception if we set the parent class loader
- // to null, so we will work around that case by setting the parent
- // class loader to the system class loader in getClassLoader() below.
- cl = null;
- System.err.println("Problem creating boot delegation class loader: " + ex);
- }
- m_defBootClassLoader = cl;
- }
+ // Bundle wiring when resolved.
+ private volatile BundleWiringImpl m_wiring = null;
// Boot delegation packages.
private final String[] m_bootPkgs;
private final boolean[] m_bootPkgWildcards;
- // Boolean flag to enable/disable implicit boot delegation.
- private final boolean m_implicitBootDelegation;
- // Boolean flag to enable/disable local URLs.
- private final boolean m_useLocalURLs;
-
// Re-usable security manager for accessing class context.
private static SecurityManagerEx m_sm = new SecurityManagerEx();
- // Thread local to detect class loading cycles.
- private final ThreadLocal m_cycleCheck = new ThreadLocal();
-
- // Thread local to keep track of deferred activation.
- private static final ThreadLocal m_deferredActivation = new ThreadLocal();
-
- // Flag indicating whether we are on an old JVM or not.
- private volatile static boolean m_isPreJava5 = false;
-
/**
* This constructor is used by the extension manager, since it needs
* a constructor that does not throw an exception.
@@ -195,16 +144,11 @@ public class BundleRevisionImpl implemen
m_version = null;
m_declaredCaps = Collections.EMPTY_LIST;
m_declaredReqs = Collections.EMPTY_LIST;
- m_declaredDynReqs = Collections.EMPTY_LIST;
- m_nativeLibraries = null;
+ m_declaredDynamicReqs = Collections.EMPTY_LIST;
+ m_declaredNativeLibs = null;
m_declaredActivationPolicy = EAGER_ACTIVATION;
m_activationExcludes = null;
m_activationIncludes = null;
- m_implicitBootDelegation = false;
- m_useLocalURLs =
- (m_configMap.get(FelixConstants.USE_LOCALURLS_PROP) == null)
- ? false : true;
- m_bootClassLoader = m_defBootClassLoader;
}
BundleRevisionImpl(
@@ -225,28 +169,6 @@ public class BundleRevisionImpl implemen
m_bootPkgs = bootPkgs;
m_bootPkgWildcards = bootPkgWildcards;
- m_implicitBootDelegation =
- (m_configMap.get(FelixConstants.IMPLICIT_BOOT_DELEGATION_PROP) == null)
- || Boolean.valueOf(
- (String) m_configMap.get(
- FelixConstants.IMPLICIT_BOOT_DELEGATION_PROP)).booleanValue();
-
- m_useLocalURLs =
- (m_configMap.get(FelixConstants.USE_LOCALURLS_PROP) == null)
- ? false : true;
-
- ClassLoader bootLoader = m_defBootClassLoader;
- Object map = m_configMap.get(FelixConstants.BOOT_CLASSLOADERS_PROP);
- if (map instanceof Map)
- {
- Object l = ((Map) map).get(bundle);
- if (l instanceof ClassLoader)
- {
- bootLoader = (ClassLoader) l;
- }
- }
- m_bootClassLoader = bootLoader;
-
ManifestParser mp = new ManifestParser(m_logger, m_configMap, this, m_headerMap);
// Record some of the parsed metadata. Note, if this is an extension
@@ -256,8 +178,8 @@ public class BundleRevisionImpl implemen
m_version = mp.getBundleVersion();
m_declaredCaps = mp.isExtension() ? null : mp.getCapabilities();
m_declaredReqs = mp.getRequirements();
- m_declaredDynReqs = mp.getDynamicRequirements();
- m_nativeLibraries = mp.getLibraries();
+ m_declaredDynamicReqs = mp.getDynamicRequirements();
+ m_declaredNativeLibs = mp.getLibraries();
m_declaredActivationPolicy = mp.getActivationPolicy();
m_activationExcludes = (mp.getActivationExcludeDirective() == null)
? null
@@ -269,125 +191,63 @@ public class BundleRevisionImpl implemen
m_isExtension = mp.isExtension();
}
- //
- // BundleRevision methods.
- //
-
- public String getSymbolicName()
- {
- return m_symbolicName;
- }
-
- public Version getVersion()
- {
- return m_version;
- }
-
- public synchronized List<BundleCapability> getDeclaredCapabilities(String namespace)
+ int getDeclaredActivationPolicy()
{
- List<BundleCapability> result = m_declaredCaps;
- if (namespace != null)
- {
- result = new ArrayList<BundleCapability>();
- for (BundleCapability cap : m_declaredCaps)
- {
- if (cap.getNamespace().equals(namespace))
- {
- result.add(cap);
- }
- }
- }
- return result;
+ return m_declaredActivationPolicy;
}
- public synchronized List<BundleRequirement> getDeclaredRequirements(String namespace)
+ List<String> getActivationExcludes()
{
- List<BundleRequirement> result = m_declaredReqs;
- if (namespace != null)
- {
- result = new ArrayList<BundleRequirement>();
- for (BundleRequirement req : m_declaredReqs)
- {
- if (req.getNamespace().equals(namespace))
- {
- result.add(req);
- }
- }
- }
- return result;
+ return m_activationExcludes;
}
- public synchronized List<BundleRequirement> getDeclaredDynamicRequirements()
+ List<String> getActivationIncludes()
{
- return m_declaredDynReqs;
+ return m_activationIncludes;
}
- public int getTypes()
+ URLStreamHandler getURLStreamHandler()
{
- if (getHeaders().containsKey(Constants.FRAGMENT_HOST))
- {
- return BundleRevision.TYPE_FRAGMENT;
- }
- return 0;
+ return m_streamHandler;
}
- public BundleWiring getWiring()
+ // TODO: OSGi R4.3 - Figure out how to handle this. Here we provide access
+ // needed for BundleWiringImpl, but for implicit boot delegation property
+ // we store it in BundleWiringImpl.
+ String[] getBootDelegationPackages()
{
- return (m_isResolved) ? this : null;
+ return m_bootPkgs;
}
- public Bundle getBundle()
+ // TODO: OSGi R4.3 - Figure out how to handle this. Here we provide access
+ // needed for BundleWiringImpl, but for implicit boot delegation property
+ // we store it in BundleWiringImpl.
+ boolean[] getBootDelegationPackageWildcards()
{
- return m_bundle;
+ return m_bootPkgWildcards;
}
//
- // BundleWiring methods.
+ // BundleRevision methods.
//
- public boolean isCurrent()
+ public String getSymbolicName()
{
- throw new UnsupportedOperationException("Not supported yet.");
+ return m_symbolicName;
}
- public boolean isInUse()
+ public Version getVersion()
{
- throw new UnsupportedOperationException("Not supported yet.");
+ return m_version;
}
- public synchronized List<BundleCapability> getCapabilities(String namespace)
+ public List<BundleCapability> getDeclaredCapabilities(String namespace)
{
- if (m_isResolved && (m_resolvedCaps == null))
- {
- List capList = (m_declaredCaps == null)
- ? new ArrayList<BundleCapability>()
- : new ArrayList<BundleCapability>(m_declaredCaps);
- for (int fragIdx = 0;
- (m_fragments != null) && (fragIdx < m_fragments.size());
- fragIdx++)
- {
- List<BundleCapability> caps =
- m_fragments.get(fragIdx).getDeclaredCapabilities(null);
- for (int capIdx = 0;
- (caps != null) && (capIdx < caps.size());
- capIdx++)
- {
- if (caps.get(capIdx).getNamespace().equals(
- BundleCapabilityImpl.PACKAGE_NAMESPACE))
- {
- capList.add(
- new HostedCapability(
- this, (BundleCapabilityImpl) caps.get(capIdx)));
- }
- }
- }
- m_resolvedCaps = Collections.unmodifiableList(capList);
- }
- List<BundleCapability> result = m_resolvedCaps;
+ List<BundleCapability> result = m_declaredCaps;
if (namespace != null)
{
result = new ArrayList<BundleCapability>();
- for (BundleCapability cap : m_resolvedCaps)
+ for (BundleCapability cap : m_declaredCaps)
{
if (cap.getNamespace().equals(namespace))
{
@@ -398,40 +258,13 @@ public class BundleRevisionImpl implemen
return result;
}
- public synchronized List<BundleRequirement> getRequirements(String namespace)
+ public List<BundleRequirement> getDeclaredRequirements(String namespace)
{
- if (m_isResolved && (m_resolvedReqs == null))
- {
- List<BundleRequirement> reqList = (m_declaredReqs == null)
- ? new ArrayList() : new ArrayList(m_declaredReqs);
- for (int fragIdx = 0;
- (m_fragments != null) && (fragIdx < m_fragments.size());
- fragIdx++)
- {
- List<BundleRequirement> reqs =
- m_fragments.get(fragIdx).getDeclaredRequirements(null);
- for (int reqIdx = 0;
- (reqs != null) && (reqIdx < reqs.size());
- reqIdx++)
- {
- if (reqs.get(reqIdx).getNamespace().equals(
- BundleCapabilityImpl.PACKAGE_NAMESPACE)
- || reqs.get(reqIdx).getNamespace().equals(
- BundleCapabilityImpl.BUNDLE_NAMESPACE))
- {
- reqList.add(
- new HostedRequirement(
- this, (BundleRequirementImpl) reqs.get(reqIdx)));
- }
- }
- }
- m_resolvedReqs = Collections.unmodifiableList(reqList);
- }
- List<BundleRequirement> result = m_resolvedReqs;
+ List<BundleRequirement> result = m_declaredReqs;
if (namespace != null)
{
result = new ArrayList<BundleRequirement>();
- for (BundleRequirement req : m_resolvedReqs)
+ for (BundleRequirement req : m_declaredReqs)
{
if (req.getNamespace().equals(namespace))
{
@@ -442,82 +275,29 @@ public class BundleRevisionImpl implemen
return result;
}
- public List<BundleWire> getProvidedWires(String namespace)
- {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public List<BundleWire> getRequiredWires(String namespace)
- {
- return m_wires;
- }
-
- public BundleRevision getRevision()
- {
- return this;
- }
-
- public synchronized ClassLoader getClassLoader()
+ public int getTypes()
{
- if (m_classLoader == null)
+ if (getHeaders().containsKey(Constants.FRAGMENT_HOST))
{
- // Determine which class loader to use based on which
- // Java platform we are running on.
- Class clazz;
- if (m_isPreJava5)
- {
- clazz = BundleClassLoader.class;
- }
- else
- {
- try
- {
- clazz = BundleClassLoaderJava5.class;
- }
- catch (Throwable th)
- {
- // If we are on pre-Java5 then we will get a verify error
- // here since we try to override a getResources() which is
- // a final method in pre-Java5.
- m_isPreJava5 = true;
- clazz = BundleClassLoader.class;
- }
- }
-
- // Use SecureAction to create the class loader if security is
- // enabled; otherwise, create it directly.
- try
- {
- Constructor ctor = (Constructor) m_secureAction.getConstructor(
- clazz, new Class[] { BundleRevisionImpl.class, ClassLoader.class });
- m_classLoader = (BundleClassLoader)
- m_secureAction.invoke(ctor,
- new Object[] { this, determineParentClassLoader() });
- }
- catch (Exception ex)
- {
- throw new RuntimeException("Unable to create module class loader: "
- + ex.getMessage() + " [" + ex.getClass().getName() + "]");
- }
+ return BundleRevision.TYPE_FRAGMENT;
}
- return m_classLoader;
+ return 0;
}
- public List<URL> findEntries(String path, String filePattern, int options)
+ public BundleWiring getWiring()
{
- throw new UnsupportedOperationException("Not supported yet.");
+ return m_wiring;
}
- public Collection<String> listResources(String path, String filePattern, int options)
+ public Bundle getBundle()
{
- throw new UnsupportedOperationException("Not supported yet.");
+ return m_bundle;
}
//
// Implementating details.
//
-
public Map getHeaders()
{
return m_headerMap;
@@ -533,75 +313,14 @@ public class BundleRevisionImpl implemen
return m_manifestVersion;
}
- public synchronized List<BundleRequirement> getResolvedDynamicRequirements()
- {
- if (m_isResolved && (m_resolvedDynReqs == null))
- {
- List<BundleRequirement> reqList = (m_declaredDynReqs == null)
- ? new ArrayList() : new ArrayList(m_declaredDynReqs);
- for (int fragIdx = 0;
- (m_fragments != null) && (fragIdx < m_fragments.size());
- fragIdx++)
- {
- List<BundleRequirement> reqs =
- ((BundleRevisionImpl) m_fragments.get(fragIdx))
- .getDeclaredDynamicRequirements();
- for (int reqIdx = 0;
- (reqs != null) && (reqIdx < reqs.size());
- reqIdx++)
- {
- if (reqs.get(reqIdx).getNamespace().equals(
- BundleCapabilityImpl.PACKAGE_NAMESPACE))
- {
- reqList.add(reqs.get(reqIdx));
- }
- }
- }
- m_resolvedDynReqs = Collections.unmodifiableList(reqList);
- }
- return m_resolvedDynReqs;
- }
-
- public synchronized List<R4Library> getNativeLibraries()
+ public List<BundleRequirement> getDeclaredDynamicRequirements()
{
- List<R4Library> result = null;
- if (m_isResolved)
- {
- List<R4Library> nativeList = (m_nativeLibraries == null)
- ? new ArrayList() : new ArrayList(m_nativeLibraries);
- for (int fragIdx = 0;
- (m_fragments != null) && (fragIdx < m_fragments.size());
- fragIdx++)
- {
- List<R4Library> libs =
- ((BundleRevisionImpl) m_fragments.get(fragIdx))
- .getNativeLibraries();
- for (int reqIdx = 0;
- (libs != null) && (reqIdx < libs.size());
- reqIdx++)
- {
- nativeList.add(libs.get(reqIdx));
- }
- }
-
- // We need to return null here if we don't have any libraries, since a
- // zero-length array is used to indicate that matching native libraries
- // could not be found when resolving the bundle.
- result = (nativeList.isEmpty())
- ? null
- : Collections.unmodifiableList(nativeList);
- }
- else
- {
- result = m_nativeLibraries;
- }
-
- return result;
+ return m_declaredDynamicReqs;
}
- public int getDeclaredActivationPolicy()
+ public List<R4Library> getDeclaredNativeLibraries()
{
- return m_declaredActivationPolicy;
+ return m_declaredNativeLibs;
}
synchronized boolean isActivationTriggered()
@@ -643,196 +362,31 @@ public class BundleRevisionImpl implemen
return m_id;
}
-// TODO: OSGi R4.3 - This really shouldn't be public, but it is needed by the
-// resolver to determine if a bundle can dynamically import.
- public synchronized boolean hasPackageSource(String pkgName)
- {
- return (m_importedPkgs.containsKey(pkgName) || m_requiredPkgs.containsKey(pkgName));
- }
-
-// TODO: OSGi R4.3 - This really shouldn't be public, but it is needed by the
-// to implement dynamic imports.
- public synchronized BundleRevision getImportedPackageSource(String pkgName)
- {
- return m_importedPkgs.get(pkgName);
- }
-
- private synchronized List<BundleRevision> getRequiredPackageSources(String pkgName)
- {
- return m_requiredPkgs.get(pkgName);
- }
-
- public synchronized List<BundleWire> getWires()
- {
- return m_wires;
- }
-
- public synchronized void addDynamicWire(ResolverWire rw)
- {
- // This not only sets the wires for the module, but it also records
- // the dependencies this module has on other modules (i.e., the provider
- // end of the wire) to simplify bookkeeping.
-
- BundleWire wire = new BundleWireImpl(
- rw.getRequirer(),
- rw.getRequirement(),
- rw.getProvider(),
- rw.getCapability());
- m_wires.add(wire);
- m_importedPkgs.put(
- (String) wire.getCapability().getAttributes().get(BundleCapabilityImpl.PACKAGE_ATTR),
- rw.getProvider());
-
-// TODO: OSGi R4.3 - What's the correct way to handle this?
-// ((BundleRevisionImpl) m_wires.get(i).getProviderWiring().getRevision())
-// .addDependentImporter(this);
- ((BundleRevisionImpl) rw.getProvider()).addDependentImporter(this);
- }
-
- public synchronized void setWires(
+ public synchronized void resolve(
+ List<BundleRevision> fragments,
List<ResolverWire> rws,
Map<ResolverWire, Set<String>> requiredPkgWires)
+ throws Exception
{
// This not only sets the wires for the module, but it also records
// the dependencies this module has on other modules (i.e., the provider
// end of the wire) to simplify bookkeeping.
- // For fragments we don't need to capture any additional dependency
- // information, since the wires are sufficient, so just record the
- // new wires. The wires are to the hosts to which the fragment is attached.
- boolean isFragment = Util.isFragment(this);
-
- // Fragments are allowed to add new wires to existing wires, but
- // normal bundles should never be wired again if they already
- // have wires.
- if (!isFragment && (m_wires != null) && (rws != null))
- {
- throw new IllegalStateException("The revision already has wires.");
- }
-
- // Convert resolver wires to bundle wires and aggregate all imported
- // or required packages.
- List<BundleWire> wires = null;
- Map<String, BundleRevision> importedPkgs = null;
- Map<String, List<BundleRevision>> requiredPkgs = null;
- if (rws != null)
- {
- wires = new ArrayList<BundleWire>(rws.size());
- importedPkgs = new HashMap<String, BundleRevision>();
- requiredPkgs = new HashMap<String, List<BundleRevision>>();
-
- for (ResolverWire rw : rws)
- {
- wires.add(
- new BundleWireImpl(
- rw.getRequirer(),
- rw.getRequirement(),
- rw.getProvider(),
- rw.getCapability()));
-
- if (isFragment)
- {
- m_logger.log(
- Logger.LOG_DEBUG,
- "FRAGMENT WIRE: "
- + this + " -> hosted by -> " + rw.getProvider());
- }
- else
- {
- m_logger.log(Logger.LOG_DEBUG, "WIRE: " + rw);
-
- if (rw.getCapability().getNamespace()
- .equals(BundleCapabilityImpl.PACKAGE_NAMESPACE))
- {
- importedPkgs.put(
- (String) rw.getCapability().getAttributes()
- .get(BundleCapabilityImpl.PACKAGE_ATTR),
- rw.getProvider());
- }
- else if (rw.getCapability().getNamespace()
- .equals(BundleCapabilityImpl.BUNDLE_NAMESPACE))
- {
- for (String pkgName : requiredPkgWires.get(rw))
- {
- List<BundleRevision> revs = requiredPkgs.get(pkgName);
- if (revs != null)
- {
- revs.add(rw.getProvider());
- }
- else
- {
- revs = new ArrayList<BundleRevision>();
- revs.add(rw.getProvider());
- requiredPkgs.put(pkgName, revs);
- }
- }
- }
- }
- }
- }
-
- // Remove module from old wire modules' dependencies,
- // since we are no longer dependent on any the moduels
- // from the old wires.
- for (int i = 0; !isFragment && (m_wires != null) && (i < m_wires.size()); i++)
- {
- if (m_wires.get(i).getCapability().getNamespace()
- .equals(BundleCapabilityImpl.BUNDLE_NAMESPACE))
- {
- ((BundleRevisionImpl) m_wires.get(i).getProviderWiring().getRevision())
- .removeDependentRequirer(this);
- }
- else if (m_wires.get(i).getCapability().getNamespace()
- .equals(BundleCapabilityImpl.PACKAGE_NAMESPACE))
- {
- ((BundleRevisionImpl) m_wires.get(i).getProviderWiring().getRevision())
- .removeDependentImporter(this);
- }
- }
-
- // If we already have wires, then add new wires to existing list (this
- // should only happen for fragments). Otherwise, simply set wires value.
- if ((m_wires != null) && (wires != null))
- {
- m_wires.addAll(wires);
- }
- else
+ // If there is an existing wiring, then dispose of it, which will
+ // remove any dependencies on other wirings.
+ if (m_wiring != null)
{
- m_wires = wires;
+ m_wiring.dispose();
+ m_wiring = null;
}
- m_importedPkgs = importedPkgs;
- m_requiredPkgs = requiredPkgs;
- // Add ourself as a dependent to the new wires' modules.
- if (!isFragment && (rws != null))
+ if (rws != null)
{
- for (ResolverWire rw : rws)
- {
- if (rw.getCapability().getNamespace()
- .equals(BundleCapabilityImpl.BUNDLE_NAMESPACE))
- {
- ((BundleRevisionImpl) rw.getProvider()).addDependentRequirer(this);
- }
- else if (rw.getCapability().getNamespace()
- .equals(BundleCapabilityImpl.PACKAGE_NAMESPACE))
- {
- ((BundleRevisionImpl) rw.getProvider()).addDependentImporter(this);
- }
- }
+ m_wiring = new BundleWiringImpl(
+ m_logger, m_configMap, m_resolver, this, fragments, rws, requiredPkgWires);
}
}
- public boolean isResolved()
- {
- return m_isResolved;
- }
-
- public void setResolved()
- {
- m_isResolved = true;
- }
-
-
public synchronized void setSecurityContext(Object securityContext)
{
m_protectionDomain = (ProtectionDomain) securityContext;
@@ -883,10 +437,6 @@ public class BundleRevisionImpl implemen
{
List contentList = new ArrayList();
calculateContentPath(this, m_content, contentList, true);
- for (int i = 0; (m_fragmentContents != null) && (i < m_fragmentContents.length); i++)
- {
- calculateContentPath(m_fragments.get(i), m_fragmentContents[i], contentList, false);
- }
return (Content[]) contentList.toArray(new Content[contentList.size()]);
}
@@ -933,17 +483,6 @@ public class BundleRevisionImpl implemen
// Try to find the embedded class path entry in the current
// content.
Content embeddedContent = content.getEntryAsContent(classPathStrings.get(i));
- // If the embedded class path entry was not found, it might be
- // in one of the fragments if the current content is the bundle,
- // so try to search the fragments if necessary.
- for (int fragIdx = 0;
- searchFragments && (embeddedContent == null)
- && (m_fragmentContents != null) && (fragIdx < m_fragmentContents.length);
- fragIdx++)
- {
- embeddedContent =
- m_fragmentContents[fragIdx].getEntryAsContent(classPathStrings.get(i));
- }
// If we found the embedded content, then add it to the
// class path content list.
if (embeddedContent != null)
@@ -973,381 +512,65 @@ public class BundleRevisionImpl implemen
return contentList;
}
- public Class getClassByDelegation(String name) throws ClassNotFoundException
+ URL getResourceLocal(String name)
{
- // We do not call getClassLoader().loadClass() for arrays because
- // it does not correctly handle array types, which is necessary in
- // cases like deserialization using a wrapper class loader.
- if ((name != null) && (name.length() > 0) && (name.charAt(0) == '['))
- {
- return Class.forName(name, false, getClassLoader());
- }
- return getClassLoader().loadClass(name);
- }
+ URL url = null;
- public URL getResourceByDelegation(String name)
- {
- try
+ // Remove leading slash, if present, but special case
+ // "/" so that it returns a root URL...this isn't very
+ // clean or meaninful, but the Spring guys want it.
+ if (name.equals("/"))
{
- return (URL) findClassOrResourceByDelegation(name, false);
+ // Just pick a class path index since it doesn't really matter.
+ url = createURL(1, name);
}
- catch (ClassNotFoundException ex)
+ else if (name.startsWith("/"))
{
- // This should never be thrown because we are loading resources.
+ name = name.substring(1);
}
- catch (ResourceNotFoundException ex)
+
+ // Check the module class path.
+ Content[] contentPath = getContentPath();
+ for (int i = 0;
+ (url == null) &&
+ (i < contentPath.length); i++)
{
- m_logger.log(m_bundle,
- Logger.LOG_DEBUG,
- ex.getMessage());
+ if (contentPath[i].hasEntry(name))
+ {
+ url = createURL(i + 1, name);
+ }
}
- return null;
+
+ return url;
}
- private Object findClassOrResourceByDelegation(String name, boolean isClass)
- throws ClassNotFoundException, ResourceNotFoundException
+ Enumeration getResourcesLocal(String name)
{
- Object result = null;
+ List l = new ArrayList();
- Set requestSet = (Set) m_cycleCheck.get();
- if (requestSet == null)
+ // Special case "/" so that it returns a root URLs for
+ // each bundle class path entry...this isn't very
+ // clean or meaningful, but the Spring guys want it.
+ final Content[] contentPath = getContentPath();
+ if (name.equals("/"))
{
- requestSet = new HashSet();
- m_cycleCheck.set(requestSet);
+ for (int i = 0; i < contentPath.length; i++)
+ {
+ l.add(createURL(i + 1, name));
+ }
}
- if (requestSet.add(name))
+ else
{
- try
+ // Remove leading slash, if present.
+ if (name.startsWith("/"))
{
- // First, try to resolve the originating revision.
- m_resolver.resolve(this);
-
- // Get the package of the target class/resource.
- String pkgName = (isClass)
- ? Util.getClassPackage(name)
- : Util.getResourcePackage(name);
-
- // Delegate any packages listed in the boot delegation
- // property to the parent class loader.
- if (shouldBootDelegate(pkgName))
- {
- try
- {
- // Get the appropriate class loader for delegation.
- ClassLoader bdcl = getBootDelegationClassLoader();
- result = (isClass)
- ? (Object) bdcl.loadClass(name)
- : (Object) bdcl.getResource(name);
- // If this is a java.* package, then always terminate the
- // search; otherwise, continue to look locally if not found.
- if (pkgName.startsWith("java.") || (result != null))
- {
- return result;
- }
- }
- catch (ClassNotFoundException ex)
- {
- // If this is a java.* package, then always terminate the
- // search; otherwise, continue to look locally if not found.
- if (pkgName.startsWith("java."))
- {
- throw ex;
- }
- }
- }
-
- // Look in the revision's imports. Note that the search may
- // be aborted if this method throws an exception, otherwise
- // it continues if a null is returned.
- result = searchImports(pkgName, name, isClass);
+ name = name.substring(1);
+ }
- // If not found, try the revision's own class path.
- if (result == null)
- {
- result = (isClass)
- ? (Object) ((BundleClassLoader) getClassLoader()).findClass(name)
- : (Object) getResourceLocal(name);
-
- // If still not found, then try the revision's dynamic imports.
- if (result == null)
- {
- result = searchDynamicImports(pkgName, name, isClass);
- }
- }
- }
- catch (ResolveException ex)
- {
- if (isClass)
- {
- // We do not use the resolve exception as the
- // cause of the exception, since this would
- // potentially leak internal module information.
- throw new ClassNotFoundException(
- name + " not found because "
- + getBundle()
- + " cannot resolve: "
- + ex.getRequirement());
- }
- else
- {
- // The spec states that if the bundle cannot be resolved, then
- // only the local bundle's resources should be searched. So we
- // will ask the module's own class path.
- URL url = getResourceLocal(name);
- if (url != null)
- {
- return url;
- }
-
- // We need to throw a resource not found exception.
- throw new ResourceNotFoundException(
- name + " not found because "
- + getBundle()
- + " cannot resolve: "
- + ex.getRequirement());
- }
- }
- finally
- {
- requestSet.remove(name);
- }
- }
- else
- {
- // If a cycle is detected, we should return null to break the
- // cycle. This should only ever be return to internal class
- // loading code and not to the actual instigator of the class load.
- return null;
- }
-
- if (result == null)
- {
- if (isClass)
- {
- throw new ClassNotFoundException(
- name + " not found by " + this.getBundle());
- }
- else
- {
- throw new ResourceNotFoundException(
- name + " not found by " + this.getBundle());
- }
- }
-
- return result;
- }
-
- URL getResourceLocal(String name)
- {
- URL url = null;
-
- // Remove leading slash, if present, but special case
- // "/" so that it returns a root URL...this isn't very
- // clean or meaninful, but the Spring guys want it.
- if (name.equals("/"))
- {
- // Just pick a class path index since it doesn't really matter.
- url = createURL(1, name);
- }
- else if (name.startsWith("/"))
- {
- name = name.substring(1);
- }
-
- // Check the module class path.
- Content[] contentPath = getContentPath();
- for (int i = 0;
- (url == null) &&
- (i < contentPath.length); i++)
- {
- if (contentPath[i].hasEntry(name))
- {
- url = createURL(i + 1, name);
- }
- }
-
- return url;
- }
-
- public Enumeration getResourcesByDelegation(String name)
- {
- Set requestSet = (Set) m_cycleCheck.get();
- if (requestSet == null)
- {
- requestSet = new HashSet();
- m_cycleCheck.set(requestSet);
- }
- if (!requestSet.contains(name))
- {
- requestSet.add(name);
- try
- {
- return findResourcesByDelegation(name);
- }
- finally
- {
- requestSet.remove(name);
- }
- }
-
- return null;
- }
-
- private Enumeration findResourcesByDelegation(String name)
- {
- Enumeration urls = null;
- List completeUrlList = new ArrayList();
-
- // First, try to resolve the originating module.
- try
- {
- m_resolver.resolve(this);
- }
- catch (ResolveException ex)
- {
- // The spec states that if the bundle cannot be resolved, then
- // only the local bundle's resources should be searched. So we
- // will ask the module's own class path.
- return getResourcesLocal(name);
- }
-
- // Get the package of the target class/resource.
- String pkgName = Util.getResourcePackage(name);
-
- // Delegate any packages listed in the boot delegation
- // property to the parent class loader.
- if (shouldBootDelegate(pkgName))
- {
- try
- {
- // Get the appropriate class loader for delegation.
- ClassLoader bdcl = getBootDelegationClassLoader();
- urls = bdcl.getResources(name);
- }
- catch (IOException ex)
- {
- // This shouldn't happen and even if it does, there
- // is nothing we can do, so just ignore it.
- }
- // If this is a java.* package, then always terminate the
- // search; otherwise, continue to look locally.
- if (pkgName.startsWith("java."))
- {
- return urls;
- }
-
- completeUrlList.add(urls);
- }
-
- // Look in the revisions's imported packages. If the package is
- // imported, then we stop searching no matter the result since
- // imported packages cannot be split.
- BundleRevision provider = getImportedPackageSource(pkgName);
- if (provider != null)
- {
- // Delegate to the provider revision.
- urls = ((BundleRevisionImpl) provider).getResourcesByDelegation(name);
-
- // If we find any resources, then add them.
- if ((urls != null) && (urls.hasMoreElements()))
- {
- completeUrlList.add(urls);
- }
-
- // Always return here since imported packages cannot be split
- // across required bundles or the revision's content.
- return new CompoundEnumeration((Enumeration[])
- completeUrlList.toArray(new Enumeration[completeUrlList.size()]));
- }
-
- // See whether we can get the resource from the required bundles and
- // regardless of whether or not this is the case continue to the next
- // step potentially passing on the result of this search (if any).
- List<BundleRevision> providers = getRequiredPackageSources(pkgName);
- if (providers != null)
- {
- for (BundleRevision p : providers)
- {
- // Delegate to the provider revision.
- urls = ((BundleRevisionImpl) p).getResourcesByDelegation(name);
-
- // If we find any resources, then add them.
- if ((urls != null) && (urls.hasMoreElements()))
- {
- completeUrlList.add(urls);
- }
-
- // Do not return here, since required packages can be split
- // across the revision's content.
- }
- }
-
- // Try the module's own class path. If we can find the resource then
- // return it together with the results from the other searches else
- // try to look into the dynamic imports.
- urls = getResourcesLocal(name);
- if ((urls != null) && (urls.hasMoreElements()))
- {
- completeUrlList.add(urls);
- }
- else
- {
- // If not found, then try the module's dynamic imports.
- // At this point, the module's imports were searched and so was the
- // the module's content. Now we make an attempt to load the
- // class/resource via a dynamic import, if possible.
- try
- {
- provider = m_resolver.resolve(this, pkgName);
- }
- catch (ResolveException ex)
- {
- // Ignore this since it is likely normal.
- }
- if (provider != null)
- {
- // Delegate to the provider revision.
- urls = ((BundleRevisionImpl) provider).getResourcesByDelegation(name);
-
- // If we find any resources, then add them.
- if ((urls != null) && (urls.hasMoreElements()))
- {
- completeUrlList.add(urls);
- }
- }
- }
-
- return new CompoundEnumeration((Enumeration[])
- completeUrlList.toArray(new Enumeration[completeUrlList.size()]));
- }
-
- private Enumeration getResourcesLocal(String name)
- {
- List l = new ArrayList();
-
- // Special case "/" so that it returns a root URLs for
- // each bundle class path entry...this isn't very
- // clean or meaningful, but the Spring guys want it.
- final Content[] contentPath = getContentPath();
- if (name.equals("/"))
- {
- for (int i = 0; i < contentPath.length; i++)
- {
- l.add(createURL(i + 1, name));
- }
- }
- else
- {
- // Remove leading slash, if present.
- if (name.startsWith("/"))
- {
- name = name.substring(1);
- }
-
- // Check the module class path.
- for (int i = 0; i < contentPath.length; i++)
- {
- if (contentPath[i].hasEntry(name))
+ // Check the module class path.
+ for (int i = 0; i < contentPath.length; i++)
+ {
+ if (contentPath[i].hasEntry(name))
{
// Use the class path index + 1 for creating the path so
// that we can differentiate between module content URLs
@@ -1461,102 +684,6 @@ public class BundleRevisionImpl implemen
return null;
}
- //
- // Fragment and dependency management methods.
- //
-
- public synchronized List<BundleRevision> getFragments()
- {
- return m_fragments;
- }
-
- private synchronized void detachHost(BundleRevision host)
- {
- if (m_wires != null)
- {
- for (Iterator<BundleWire> it = m_wires.iterator(); it.hasNext(); )
- {
- BundleWire wire = it.next();
- if (wire.getCapability().getNamespace().equals(BundleCapabilityImpl.HOST_NAMESPACE)
- && wire.getProviderWiring().getRevision().equals(host))
- {
- it.remove();
- break;
- }
- }
- }
- }
-
- public synchronized void attachFragments(List<BundleRevision> fragments) throws Exception
- {
- // Remove the host wires for this module from old fragments.
- // We will generally only remove host wires when we are uninstalling
- // the module.
- if (m_fragments != null)
- {
- for (BundleRevision fragment : m_fragments)
- {
- ((BundleRevisionImpl) fragment).detachHost(this);
- }
- }
-
- // Close previous fragment contents.
- for (int i = 0; (m_fragmentContents != null) && (i < m_fragmentContents.length); i++)
- {
- m_fragmentContents[i].close();
- }
- m_fragmentContents = null;
-
- // Close the old content path, since we'll need to recalculate it for
- // for the added (or removed) fragments.
- for (int i = 0; (m_contentPath != null) && (i < m_contentPath.length); i++)
- {
- // Don't close this module's content, if it is on the content path.
- if (m_content != m_contentPath[i])
- {
- m_contentPath[i].close();
- }
- }
- m_contentPath = null;
-
- // Remove cached capabilities and requirements.
- m_resolvedCaps = null;
- m_resolvedReqs = null;
- m_resolvedDynReqs = null;
-
- // Update the dependencies on the new fragments.
- m_fragments = fragments;
-
- // We need to sort the fragments and add ourself as a dependent of each one.
- // We also need to create an array of fragment contents to attach to our
- // content path.
- if (m_fragments != null)
- {
- // Sort fragments according to ID order, if necessary.
- // Note that this sort order isn't 100% correct since
- // it uses a string, but it is likely close enough and
- // avoids having to create more objects.
- if (m_fragments.size() > 1)
- {
- SortedMap<String, BundleRevision> sorted = new TreeMap<String, BundleRevision>();
- for (BundleRevision f : m_fragments)
- {
- sorted.put(((BundleRevisionImpl) f).getId(), f);
- }
- m_fragments = new ArrayList(sorted.values());
- }
- m_fragmentContents = new Content[m_fragments.size()];
- for (int i = 0; (m_fragments != null) && (i < m_fragments.size()); i++)
- {
- m_fragmentContents[i] =
- ((BundleRevisionImpl) m_fragments.get(i)).getContent()
- .getEntryAsContent(FelixConstants.CLASS_PATH_DOT);
- }
- // Recalculate the content path for the new fragments.
- m_contentPath = initializeContentPath();
- }
- }
-
public synchronized List<BundleRevision> getDependentImporters()
{
return m_dependentImporters;
@@ -1599,9 +726,11 @@ public class BundleRevisionImpl implemen
if (Util.isFragment(this))
{
dependents = new ArrayList<BundleRevision>();
- for (int i = 0; (m_wires != null) && (i < m_wires.size()); i++)
+ List<BundleWire> wires = (m_wiring == null)
+ ? null : m_wiring.getRequiredWires(null);
+ for (int i = 0; (wires != null) && (i < wires.size()); i++)
{
- dependents.add(m_wires.get(i).getCapability().getRevision());
+ dependents.add(wires.get(i).getProviderWiring().getRevision());
}
}
else
@@ -1616,18 +745,20 @@ public class BundleRevisionImpl implemen
public synchronized void close()
{
+ try
+ {
+ resolve(null, null, null);
+ }
+ catch (Exception ex)
+ {
+ m_logger.log(Logger.LOG_ERROR, "Error releasing revision: " + ex.getMessage(), ex);
+ }
m_content.close();
for (int i = 0; (m_contentPath != null) && (i < m_contentPath.length); i++)
{
m_contentPath[i].close();
}
m_contentPath = null;
- for (int i = 0; (m_fragmentContents != null) && (i < m_fragmentContents.length); i++)
- {
- m_fragmentContents[i].close();
- }
- m_fragmentContents = null;
- m_classLoader = null;
}
@Override
@@ -1636,1106 +767,20 @@ public class BundleRevisionImpl implemen
return m_id;
}
- private ClassLoader determineParentClassLoader()
- {
- // Determine the class loader's parent based on the
- // configuration property; use boot class loader by
- // default.
- String cfg = (String) m_configMap.get(Constants.FRAMEWORK_BUNDLE_PARENT);
- cfg = (cfg == null) ? Constants.FRAMEWORK_BUNDLE_PARENT_BOOT : cfg;
- final ClassLoader parent;
- if (cfg.equalsIgnoreCase(Constants.FRAMEWORK_BUNDLE_PARENT_APP))
- {
- parent = m_secureAction.getSystemClassLoader();
- }
- else if (cfg.equalsIgnoreCase(Constants.FRAMEWORK_BUNDLE_PARENT_EXT))
- {
- parent = m_secureAction.getSystemClassLoader().getParent();
- }
- else if (cfg.equalsIgnoreCase(Constants.FRAMEWORK_BUNDLE_PARENT_FRAMEWORK))
- {
- parent = BundleRevisionImpl.class.getClassLoader();
- }
- // On Android we cannot set the parent class loader to be null, so
- // we special case that situation here and set it to the system
- // class loader by default instead, which is not really spec.
- else if (m_bootClassLoader == null)
- {
- parent = m_secureAction.getSystemClassLoader();
- }
- else
- {
- parent = null;
- }
- return parent;
- }
-
- private Object searchImports(String pkgName, String name, boolean isClass)
- throws ClassNotFoundException, ResourceNotFoundException
+ static URL convertToLocalUrl(URL url)
{
- // Check if the package is imported.
- BundleRevision provider = getImportedPackageSource(pkgName);
- if (provider != null)
- {
- // If we find the class or resource, then return it.
- Object result = (isClass)
- ? (Object) ((BundleRevisionImpl) provider).getClassByDelegation(name)
- : (Object) ((BundleRevisionImpl) provider).getResourceByDelegation(name);
- if (result != null)
- {
- return result;
- }
-
- // If no class was found, then we must throw an exception
- // since the provider of this package did not contain the
- // requested class and imported packages are atomic.
- throw new ClassNotFoundException(name);
- }
-
- // Check if the package is required.
- List<BundleRevision> providers = getRequiredPackageSources(pkgName);
- if (providers != null)
- {
- for (BundleRevision p : providers)
- {
- // If we find the class or resource, then return it.
- try
- {
- Object result = (isClass)
- ? (Object) ((BundleRevisionImpl) p).getClassByDelegation(name)
- : (Object) ((BundleRevisionImpl) p).getResourceByDelegation(name);
- if (result != null)
- {
- return result;
- }
- }
- catch (ClassNotFoundException ex)
- {
- // Since required packages can be split, don't throw an
- // exception here if it is not found. Instead, we'll just
- // continue searching other required bundles and the
- // revision's local content.
- }
- }
- }
-
- return null;
- }
-
- private Object searchDynamicImports(
- final String pkgName, final String name, final boolean isClass)
- throws ClassNotFoundException, ResourceNotFoundException
- {
- // At this point, the module's imports were searched and so was the
- // the module's content. Now we make an attempt to load the
- // class/resource via a dynamic import, if possible.
- BundleRevision provider = null;
- try
- {
- provider = m_resolver.resolve(this, pkgName);
- }
- catch (ResolveException ex)
+ if (url.getProtocol().equals("bundle"))
{
- // Ignore this since it is likely normal.
- }
-
- // If the dynamic import was successful, then this initial
- // time we must directly return the result from dynamically
- // created package sources, but subsequent requests for
- // classes/resources in the associated package will be
- // processed as part of normal static imports.
- if (provider != null)
- {
- // Return the class or resource.
- return (isClass)
- ? (Object) ((BundleRevisionImpl) provider).getClassByDelegation(name)
- : (Object) ((BundleRevisionImpl) provider).getResourceByDelegation(name);
- }
-
- // If implicit boot delegation is enabled, then try to guess whether
- // we should boot delegate.
- if (m_implicitBootDelegation)
- {
- // At this point, the class/resource could not be found by the bundle's
- // static or dynamic imports, nor its own content. Before we throw
- // an exception, we will try to determine if the instigator of the
- // class/resource load was a class from a bundle or not. This is necessary
- // because the specification mandates that classes on the class path
- // should be hidden (except for java.*), but it does allow for these
- // classes/resources to be exposed by the system bundle as an export.
- // However, in some situations classes on the class path make the faulty
- // assumption that they can access everything on the class path from
- // every other class loader that they come in contact with. This is
- // not true if the class loader in question is from a bundle. Thus,
- // this code tries to detect that situation. If the class instigating
- // the load request was NOT from a bundle, then we will make the
- // assumption that the caller actually wanted to use the parent class
- // loader and we will delegate to it. If the class was
- // from a bundle, then we will enforce strict class loading rules
- // for the bundle and throw an exception.
-
- // Get the class context to see the classes on the stack.
- final Class[] classes = m_sm.getClassContext();
try
{
- if (System.getSecurityManager() != null)
- {
- return AccessController
- .doPrivileged(new PrivilegedExceptionAction()
- {
- public Object run() throws Exception
- {
- return doImplicitBootDelegation(classes, name,
- isClass);
- }
- });
- }
- else
- {
- return doImplicitBootDelegation(classes, name, isClass);
- }
+ url = ((URLHandlersBundleURLConnection)
+ url.openConnection()).getLocalURL();
}
- catch (PrivilegedActionException ex)
+ catch (IOException ex)
{
- Exception cause = ex.getException();
- if (cause instanceof ClassNotFoundException)
- {
- throw (ClassNotFoundException) cause;
- }
- else
- {
- throw (ResourceNotFoundException) cause;
- }
- }
- }
- return null;
- }
-
- private Object doImplicitBootDelegation(Class[] classes, String name, boolean isClass)
- throws ClassNotFoundException, ResourceNotFoundException
- {
- // Start from 1 to skip security manager class.
- for (int i = 1; i < classes.length; i++)
- {
- // Find the first class on the call stack that is not from
- // the class loader that loaded the Felix classes or is not
- // a class loader or class itself, because we want to ignore
- // calls to ClassLoader.loadClass() and Class.forName() since
- // we are trying to find out who instigated the class load.
- // Also ignore inner classes of class loaders, since we can
- // assume they are a class loader too.
-
- // TODO: FRAMEWORK - This check is a hack and we should see if we can think
- // of another way to do it, since it won't necessarily work in all situations.
- // Since Felix uses threads for changing the start level
- // and refreshing packages, it is possible that there are no
- // bundle classes on the call stack; therefore, as soon as we
- // see Thread on the call stack we exit this loop. Other cases
- // where bundles actually use threads are not an issue because
- // the bundle classes will be on the call stack before the
- // Thread class.
- if (Thread.class.equals(classes[i]))
- {
- break;
- }
- // Break if the current class came from a bundle, since we should
- // not implicitly boot delegate in that case.
- else if (isClassLoadedFromBundleRevision(classes[i]))
- {
- break;
- }
- // Break if this goes through BundleImpl because it must be a call
- // to Bundle.loadClass() which should not implicitly boot delegate.
- else if (BundleImpl.class.equals(classes[i]))
- {
- break;
- }
- else if (isClassExternal(classes[i]))
- {
- try
- {
- // Return the class or resource from the parent class loader.
- return (isClass)
- ? (Object) this.getClass().getClassLoader().loadClass(name)
- : (Object) this.getClass().getClassLoader().getResource(name);
- }
- catch (NoClassDefFoundError ex)
- {
- // Ignore, will return null
- }
- break;
- }
- }
-
- return null;
- }
-
- private boolean isClassLoadedFromBundleRevision(Class clazz)
- {
- // The target class is loaded by a bundle class loader,
- // then return true.
- if (BundleClassLoader.class.isInstance(clazz.getClassLoader()))
- {
- return true;
- }
-
- // If the target class was loaded from a class loader that
- // came from a bundle, then return true.
- ClassLoader last = null;
- for (ClassLoader cl = clazz.getClassLoader();
- (cl != null) && (last != cl);
- cl = cl.getClass().getClassLoader())
- {
- last = cl;
- if (BundleClassLoader.class.isInstance(cl))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Tries to determine whether the given class is part of the framework or not.
- * Framework classes include everything in org.apache.felix.framework.* and
- * org.osgi.framework.*. We also consider ClassLoader and Class to be internal
- * classes, because they are inserted into the stack trace as a result of
- * method overloading. Typically, ClassLoader or Class will be mixed in
- * between framework classes or will be at the point where the class loading
- * request enters the framework class loading mechanism, which will then be
- * followed by either bundle or external code, which will then exit our
- * attempt to determine if we should boot delegate or not. Other standard
- * class loaders, like URLClassLoader, are considered external classes and
- * should trigger boot delegation. This means that bundles can create standard
- * class loaders to get access to boot packages, but this is the standard
- * behavior of class loaders.
- * @param clazz the class to determine if it is external or not.
- * @return <tt>true</tt> if the class is external, otherwise <tt>false</tt>.
- */
- private boolean isClassExternal(Class clazz)
- {
- if (clazz.getName().startsWith("org.apache.felix.framework."))
- {
- return false;
- }
- else if (clazz.getName().startsWith("org.osgi.framework."))
- {
- return false;
- }
- else if (ClassLoader.class.equals(clazz))
- {
- return false;
- }
- else if (Class.class.equals(clazz))
- {
- return false;
- }
- return true;
- }
-
- boolean shouldBootDelegate(String pkgName)
- {
- // Always boot delegate if the bundle has a configured
- // boot class loader.
- if (m_bootClassLoader != m_defBootClassLoader)
- {
- return true;
- }
-
- boolean result = false;
-
- // Only consider delegation if we have a package name, since
- // we don't want to promote the default package. The spec does
- // not take a stand on this issue.
- if (pkgName.length() > 0)
- {
- for (int i = 0; !result && (i < m_bootPkgs.length); i++)
- {
- // Check if the boot package is wildcarded.
- // A wildcarded boot package will be in the form "foo.",
- // so a matching subpackage will start with "foo.", e.g.,
- // "foo.bar".
- if (m_bootPkgWildcards[i] && pkgName.startsWith(m_bootPkgs[i]))
- {
- return true;
- }
- // If not wildcarded, then check for an exact match.
- else if (m_bootPkgs[i].equals(pkgName))
- {
- return true;
- }
- }
- }
-
- return result;
- }
-
- ClassLoader getBootDelegationClassLoader()
- {
- // Get the appropriate class loader for delegation.
- ClassLoader parent = (m_classLoader == null)
- ? determineParentClassLoader() : m_classLoader.getParent();
- return (parent == null) ? m_bootClassLoader : parent;
- }
-
- private static final Constructor m_dexFileClassConstructor;
- private static final Method m_dexFileClassLoadDex;
- private static final Method m_dexFileClassLoadClass;
-
- static
- {
- Constructor dexFileClassConstructor = null;
- Method dexFileClassLoadDex = null;
- Method dexFileClassLoadClass = null;
- try
- {
- Class dexFileClass;
- try
- {
- dexFileClass = Class.forName("dalvik.system.DexFile");
- }
- catch (Exception ex)
- {
- dexFileClass = Class.forName("android.dalvik.DexFile");
- }
-
- try
- {
- dexFileClassLoadDex = dexFileClass.getMethod("loadDex",
- new Class[]{String.class, String.class, Integer.TYPE});
- }
- catch (Exception ex)
- {
- // Nothing we need to do
- }
- dexFileClassConstructor = dexFileClass.getConstructor(
- new Class[] { java.io.File.class });
- dexFileClassLoadClass = dexFileClass.getMethod("loadClass",
- new Class[] { String.class, ClassLoader.class });
- }
- catch (Throwable ex)
- {
- dexFileClassConstructor = null;
- dexFileClassLoadDex = null;
- dexFileClassLoadClass = null;
- }
- m_dexFileClassConstructor = dexFileClassConstructor;
- m_dexFileClassLoadDex= dexFileClassLoadDex;
- m_dexFileClassLoadClass = dexFileClassLoadClass;
- }
-
- public class BundleClassLoaderJava5 extends BundleClassLoader
- {
- public BundleClassLoaderJava5(ClassLoader parent)
- {
- super(parent);
- }
-
- @Override
- public Enumeration getResources(String name)
- {
- Enumeration urls = BundleRevisionImpl.this.getResourcesByDelegation(name);
- if (m_useLocalURLs)
- {
- urls = new ToLocalUrlEnumeration(urls);
- }
- return urls;
- }
-
- @Override
- protected Enumeration findResources(String name)
- {
- return BundleRevisionImpl.this.getResourcesLocal(name);
- }
- }
-
- public class BundleClassLoader extends SecureClassLoader implements BundleReference
- {
- private final Map m_jarContentToDexFile;
- private Object[][] m_cachedLibs = new Object[0][];
- private static final int LIBNAME_IDX = 0;
- private static final int LIBPATH_IDX = 1;
-
- public BundleClassLoader(ClassLoader parent)
- {
- super(parent);
- if (m_dexFileClassLoadClass != null)
- {
- m_jarContentToDexFile = new HashMap();
- }
- else
- {
- m_jarContentToDexFile = null;
- }
- }
-
- public Bundle getBundle()
- {
- return BundleRevisionImpl.this.getBundle();
- }
-
- @Override
- protected Class loadClass(String name, boolean resolve)
- throws ClassNotFoundException
- {
- Class clazz = null;
-
- // Make sure the class was not already loaded.
- synchronized (this)
- {
- clazz = findLoadedClass(name);
- }
-
- if (clazz == null)
- {
- try
- {
- clazz = (Class) findClassOrResourceByDelegation(name, true);
- }
- catch (ResourceNotFoundException ex)
- {
- // This should never happen since we are asking for a class,
- // so just ignore it.
- }
- catch (ClassNotFoundException cnfe)
- {
- ClassNotFoundException ex = cnfe;
- String msg = name;
- if (m_logger.getLogLevel() >= Logger.LOG_DEBUG)
- {
- msg = diagnoseClassLoadError(m_resolver, BundleRevisionImpl.this, name);
- ex = (msg != null)
- ? new ClassNotFoundException(msg, cnfe)
- : ex;
- }
- throw ex;
- }
- }
-
- // Resolve the class and return it.
- if (resolve)
- {
- resolveClass(clazz);
- }
- return clazz;
- }
-
- @Override
- protected Class findClass(String name) throws ClassNotFoundException
- {
- Class clazz = null;
-
- // Search for class in bundle revision.
- if (clazz == null)
- {
- String actual = name.replace('.', '/') + ".class";
-
- byte[] bytes = null;
-
- // Check the bundle class path.
- Content[] contentPath = getContentPath();
- Content content = null;
- for (int i = 0;
- (bytes == null) &&
- (i < contentPath.length); i++)
- {
- bytes = contentPath[i].getEntryAsBytes(actual);
- content = contentPath[i];
- }
-
- if (bytes != null)
- {
- // Get package name.
- String pkgName = Util.getClassPackage(name);
-
- // Before we actually attempt to define the class, grab
- // the lock for this class loader and make sure than no
- // other thread has defined this class in the meantime.
- synchronized (this)
- {
- clazz = findLoadedClass(name);
-
- if (clazz == null)
- {
- int activationPolicy =
- ((BundleImpl) getBundle()).isDeclaredActivationPolicyUsed()
- ? ((BundleRevisionImpl) ((BundleImpl) getBundle())
- .getCurrentRevision()).getDeclaredActivationPolicy()
- : EAGER_ACTIVATION;
-
- // If the revision is using deferred activation, then if
- // we load this class from this revision we need to activate
- // the bundle before returning the class. We will short
- // circuit the trigger matching if the trigger is already
- // tripped.
- boolean isTriggerClass = m_isActivationTriggered
- ? false : isActivationTrigger(pkgName);
- if (!m_isActivationTriggered
- && isTriggerClass
- && (activationPolicy == BundleRevisionImpl.LAZY_ACTIVATION)
- && (getBundle().getState() == Bundle.STARTING))
- {
- List deferredList = (List) m_deferredActivation.get();
- if (deferredList == null)
- {
- deferredList = new ArrayList();
- m_deferredActivation.set(deferredList);
- }
- deferredList.add(new Object[] { name, getBundle() });
- }
- // We need to try to define a Package object for the class
- // before we call defineClass() if we haven't already
- // created it.
- if (pkgName.length() > 0)
- {
- if (getPackage(pkgName) == null)
- {
- Object[] params = definePackage(pkgName);
- if (params != null)
- {
- definePackage(
- pkgName,
- (String) params[0],
- (String) params[1],
- (String) params[2],
- (String) params[3],
- (String) params[4],
- (String) params[5],
- null);
- }
- else
- {
- definePackage(pkgName, null, null,
- null, null, null, null, null);
- }
- }
- }
-
- // If we can load the class from a dex file do so
- if (content instanceof JarContent)
- {
- try
- {
- clazz = getDexFileClass((JarContent) content, name, this);
- }
- catch (Exception ex)
- {
- // Looks like we can't
- }
- }
-
- if (clazz == null)
- {
- // If we have a security context, then use it to
- // define the class with it for security purposes,
- // otherwise define the class without a protection domain.
- if (m_protectionDomain != null)
- {
- clazz = defineClass(name, bytes, 0, bytes.length,
- m_protectionDomain);
- }
- else
- {
- clazz = defineClass(name, bytes, 0, bytes.length);
- }
- }
-
- // At this point if we have a trigger class, then the deferred
- // activation trigger has tripped.
- if (!m_isActivationTriggered && isTriggerClass && (clazz != null))
- {
- m_isActivationTriggered = true;
- }
- }
- }
-
- // Perform deferred activation without holding the class loader lock,
- // if the class we are returning is the instigating class.
- List deferredList = (List) m_deferredActivation.get();
- if ((deferredList != null)
- && (deferredList.size() > 0)
- && ((Object[]) deferredList.get(0))[0].equals(name))
- {
- for (int i = deferredList.size() - 1; i >= 0; i--)
- {
- try
- {
- ((BundleImpl) ((Object[]) deferredList.get(i))[1]).getFramework().activateBundle(
- (BundleImpl) ((Object[]) deferredList.get(i))[1], true);
- }
- catch (BundleException ex)
- {
- ex.printStackTrace();
- }
- }
- deferredList.clear();
- }
- }
- }
-
- return clazz;
- }
-
- private Object[] definePackage(String pkgName)
- {
- String spectitle = (String) m_headerMap.get("Specification-Title");
- String specversion = (String) m_headerMap.get("Specification-Version");
- String specvendor = (String) m_headerMap.get("Specification-Vendor");
- String impltitle = (String) m_headerMap.get("Implementation-Title");
- String implversion = (String) m_headerMap.get("Implementation-Version");
- String implvendor = (String) m_headerMap.get("Implementation-Vendor");
- if ((spectitle != null)
- || (specversion != null)
- || (specvendor != null)
- || (impltitle != null)
- || (implversion != null)
- || (implvendor != null))
- {
- return new Object[] {
- spectitle, specversion, specvendor, impltitle, implversion, implvendor
- };
- }
- return null;
- }
-
- private Class getDexFileClass(JarContent content, String name, ClassLoader loader)
- throws Exception
- {
- if (m_jarContentToDexFile == null)
- {
- return null;
- }
-
- Object dexFile = null;
-
- if (!m_jarContentToDexFile.containsKey(content))
- {
- try
- {
- if (m_dexFileClassLoadDex != null)
- {
- dexFile = m_dexFileClassLoadDex.invoke(null,
- new Object[]{content.getFile().getAbsolutePath(),
- content.getFile().getAbsolutePath() + ".dex", new Integer(0)});
- }
- else
- {
- dexFile = m_dexFileClassConstructor.newInstance(
- new Object[] { content.getFile() });
- }
- }
- finally
- {
- m_jarContentToDexFile.put(content, dexFile);
- }
- }
- else
- {
- dexFile = m_jarContentToDexFile.get(content);
- }
-
- if (dexFile != null)
- {
- return (Class) m_dexFileClassLoadClass.invoke(dexFile,
- new Object[] { name.replace('.','/'), loader });
- }
- return null;
- }
-
- @Override
- public URL getResource(String name)
- {
- URL url = BundleRevisionImpl.this.getResourceByDelegation(name);
- if (m_useLocalURLs)
- {
- url = convertToLocalUrl(url);
- }
- return url;
- }
-
- @Override
- protected URL findResource(String name)
- {
- return BundleRevisionImpl.this.getResourceLocal(name);
- }
-
- // The findResources() method should only look at the revision itself, but
- // instead it tries to delegate because in Java version prior to 1.5 the
- // getResources() method was final and could not be overridden. We should
- // override getResources() like getResource() to make it delegate, but we
- // can't. As a workaround, we make findResources() delegate instead.
- @Override
- protected Enumeration findResources(String name)
- {
- Enumeration urls = BundleRevisionImpl.this.getResourcesByDelegation(name);
- if (m_useLocalURLs)
- {
- urls = new ToLocalUrlEnumeration(urls);
- }
- return urls;
- }
-
- @Override
- protected String findLibrary(String name)
- {
- // Remove leading slash, if present.
- if (name.startsWith("/"))
- {
- name = name.substring(1);
- }
-
- String result = null;
- // CONCURRENCY: In the long run, we might want to break this
- // sync block in two to avoid manipulating the cache while
- // holding the lock, but for now we will do it the simple way.
- synchronized (this)
- {
- // Check to make sure we haven't already found this library.
- for (int i = 0; (result == null) && (i < m_cachedLibs.length); i++)
- {
- if (m_cachedLibs[i][LIBNAME_IDX].equals(name))
- {
- result = (String) m_cachedLibs[i][LIBPATH_IDX];
- }
- }
-
- // If we don't have a cached result, see if we have a matching
- // native library.
- if (result == null)
- {
- List<R4Library> libs = getNativeLibraries();
- for (int libIdx = 0; (libs != null) && (libIdx < libs.size()); libIdx++)
- {
- if (libs.get(libIdx).match(m_configMap, name))
- {
- // Search bundle content first for native library.
- result = getContent().getEntryAsNativeLibrary(
- libs.get(libIdx).getEntryName());
- // If not found, then search fragments in order.
- for (int i = 0;
- (result == null) && (m_fragmentContents != null)
- && (i < m_fragmentContents.length);
- i++)
- {
- result = m_fragmentContents[i].getEntryAsNativeLibrary(
- libs.get(libIdx).getEntryName());
- }
- }
- }
-
- // Remember the result for future requests.
- if (result != null)
- {
- Object[][] tmp = new Object[m_cachedLibs.length + 1][];
- System.arraycopy(m_cachedLibs, 0, tmp, 0, m_cachedLibs.length);
- tmp[m_cachedLibs.length] = new Object[] { name, result };
- m_cachedLibs = tmp;
- }
- }
- }
-
- return result;
- }
-
- @Override
- public String toString()
- {
- return BundleRevisionImpl.this.toString();
- }
- }
-
- static URL convertToLocalUrl(URL url)
- {
- if (url.getProtocol().equals("bundle"))
- {
- try
- {
- url = ((URLHandlersBundleURLConnection)
- url.openConnection()).getLocalURL();
- }
- catch (IOException ex)
- {
- // Ignore and add original url.
+ // Ignore and add original url.
}
}
return url;
}
-
- static class ToLocalUrlEnumeration implements Enumeration
- {
- final Enumeration m_enumeration;
-
- ToLocalUrlEnumeration(Enumeration enumeration)
- {
- m_enumeration = enumeration;
- }
-
- public boolean hasMoreElements()
- {
- return m_enumeration.hasMoreElements();
- }
-
- public Object nextElement()
- {
- return convertToLocalUrl((URL) m_enumeration.nextElement());
- }
- }
-
- private static String diagnoseClassLoadError(
- StatefulResolver resolver, BundleRevisionImpl revision, String name)
- {
- // We will try to do some diagnostics here to help the developer
- // deal with this exception.
-
- // Get package name.
- String pkgName = Util.getClassPackage(name);
- if (pkgName.length() == 0)
- {
- return null;
- }
-
- // First, get the bundle string of the revision doing the class loader.
- String importer = revision.getBundle().toString();
-
- // Next, check to see if the revision imports the package.
- List<BundleWire> wires = revision.getWires();
- for (int i = 0; (wires != null) && (i < wires.size()); i++)
- {
- if (wires.get(i).getCapability().getNamespace().equals(BundleCapabilityImpl.PACKAGE_NAMESPACE) &&
- wires.get(i).getCapability().getAttributes().get(BundleCapabilityImpl.PACKAGE_ATTR).equals(pkgName))
- {
- String exporter = wires.get(i).getProviderWiring().getBundle().toString();
-
- StringBuffer sb = new StringBuffer("*** Package '");
- sb.append(pkgName);
- sb.append("' is imported by bundle ");
- sb.append(importer);
- sb.append(" from bundle ");
- sb.append(exporter);
- sb.append(", but the exported package from bundle ");
- sb.append(exporter);
- sb.append(" does not contain the requested class '");
- sb.append(name);
- sb.append("'. Please verify that the class name is correct in the importing bundle ");
- sb.append(importer);
- sb.append(" and/or that the exported package is correctly bundled in ");
- sb.append(exporter);
- sb.append(". ***");
-
- return sb.toString();
- }
- }
-
- // Next, check to see if the package was optionally imported and
- // whether or not there is an exporter available.
- List<BundleRequirement> reqs = revision.getWiring().getRequirements(null);
-/*
-* TODO: RB - Fix diagnostic message for optional imports.
- for (int i = 0; (reqs != null) && (i < reqs.length); i++)
- {
- if (reqs[i].getName().equals(pkgName) && reqs[i].isOptional())
- {
- // Try to see if there is an exporter available.
- IModule[] exporters = getResolvedExporters(reqs[i], true);
- exporters = (exporters.length == 0)
- ? getUnresolvedExporters(reqs[i], true) : exporters;
-
- // An exporter might be available, but it may have attributes
- // that do not match the importer's required attributes, so
- // check that case by simply looking for an exporter of the
- // desired package without any attributes.
- if (exporters.length == 0)
- {
- IRequirement pkgReq = new Requirement(
- ICapability.PACKAGE_NAMESPACE, "(package=" + pkgName + ")");
- exporters = getResolvedExporters(pkgReq, true);
- exporters = (exporters.length == 0)
- ? getUnresolvedExporters(pkgReq, true) : exporters;
- }
-
- long expId = (exporters.length == 0)
- ? -1 : Util.getBundleIdFromModuleId(exporters[0].getId());
-
- StringBuffer sb = new StringBuffer("*** Class '");
- sb.append(name);
- sb.append("' was not found, but this is likely normal since package '");
- sb.append(pkgName);
- sb.append("' is optionally imported by bundle ");
- sb.append(impId);
- sb.append(".");
- if (exporters.length > 0)
- {
- sb.append(" However, bundle ");
- sb.append(expId);
[... 172 lines stripped ...]