+ * Generally, dynamically generated bundle classpath entries are not present under project + * source tree but included in the bundle as part build process. During development time such bundle classpath entries + * can be resolved to external jar files or workspace resources. Resolution of the + * same entry may change over time, similarly to how Plug-in Dependencies classpath container can switch between + * external bundles and workspace projects. + *
+ * + *
+ * A resolver is declared as an extension (org.eclipse.pde.core.bundleClasspathResolvers). This
+ * extension has the following attributes:
+ *
nature specified nature of the projects this resolver is registered for.class specifies the fully qualified name of the Java class that implements
+ * IBundleClasspathResolver.+ * The resolver is consulted when dynamically generated bundle is added to OSGi runtime launch and when looking up + * sources from the bundle. + *
+ * + * @since 3.8 + */ +public interface IBundleClasspathResolver { + + /** + * Returns a possibly empty map describing additional bundle classpath entries for a project in the workspace. + * + *The map key is a {@link IPath} describing the project relative path to a source directory or library. The value + * is the {@link Collection} of {@link IPath} locations (relative to the project or absolute) that should be added + * to the bundle classpath.
+ * + * @param javaProject the java project to collect classpath entries for + * @return additional entries to add to the bundle classpath. Map of IPath to Collection, possibly empty + */ + public Map/*The {@link Collection} will contain {@link IRuntimeClasspathEntry} describing locations where source can be obtained from.
+ * + * @param javaProject the java project to collect source entries for + * @return additional entries for the source lookup path. Collection of IRuntimeClasspathEntry, possibly empty + */ + public Collection/*
+ * org.eclipse.pde.core.bundleClasspathResolvers extension point. Classpath resolvers
+ * can then be asked to provide additional bundle classpath and source lookup entries for a project.
+ *
+ * @see IBundleClasspathResolver
+ */
+public class ClasspathContainerResolverManager {
+
+ private static final String POINT_ID = "org.eclipse.pde.core.bundleClasspathResolvers"; //$NON-NLS-1$
+ private static final String ATT_NATURE = "nature"; //$NON-NLS-1$
+ private static final String ATT_CLASS = "class"; //$NON-NLS-1$
+
+ /**
+ * Returns all classpath resolvers contributed via extension point that support the given project's nature.
+ *
+ * @param project project to check nature of
+ * @return all classpath resolvers that support the nature, possibly empty
+ */
+ public IBundleClasspathResolver[] getBundleClasspathResolvers(IProject project) {
+ List result = new ArrayList();
+
+ IExtensionRegistry registry = Platform.getExtensionRegistry();
+ IConfigurationElement[] elements = registry.getConfigurationElementsFor(POINT_ID);
+ for (int i = 0; i < elements.length; i++) {
+ String attrNature = elements[i].getAttribute(ATT_NATURE);
+ try {
+ if (project.isNatureEnabled(attrNature)) {
+ result.add(elements[i].createExecutableExtension(ATT_CLASS));
+ }
+ } catch (CoreException e) {
+ PDECore.log(e.getStatus());
+ }
+ }
+
+ return (IBundleClasspathResolver[]) result.toArray(new IBundleClasspathResolver[result.size()]);
+ }
+
+}
diff --git src/org/eclipse/pde/internal/core/ClasspathHelper.java src/org/eclipse/pde/internal/core/ClasspathHelper.java
index 613fee4..70a85f8 100644
--- src/org/eclipse/pde/internal/core/ClasspathHelper.java
+++ src/org/eclipse/pde/internal/core/ClasspathHelper.java
@@ -17,6 +17,7 @@
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.jdt.core.*;
+import org.eclipse.pde.core.IBundleClasspathResolver;
import org.eclipse.pde.core.build.IBuild;
import org.eclipse.pde.core.build.IBuildEntry;
import org.eclipse.pde.core.plugin.*;
@@ -199,8 +200,26 @@
list = new ArrayList();
list.add(output);
map.put(source, list);
+ }
+ }
+
+ // Add additional entries from contributed bundle classpath resolvers
+ IBundleClasspathResolver[] resolvers = PDECore.getDefault().getClasspathContainerResolverManager().getBundleClasspathResolvers(project);
+ for (int i = 0; i < resolvers.length; i++) {
+ Map resolved = resolvers[i].getAdditionalClasspathEntries(jProject);
+ Iterator resolvedIter = resolved.entrySet().iterator();
+ while (resolvedIter.hasNext()) {
+ Map.Entry resolvedEntry = (Map.Entry) resolvedIter.next();
+ IPath ceSource = (IPath) resolvedEntry.getKey();
+ ArrayList list = (ArrayList) map.get(ceSource);
+ if (list == null) {
+ list = new ArrayList();
+ map.put(ceSource, list);
+ }
+ list.addAll((Collection) resolvedEntry.getValue());
}
}
+
return map;
}
@@ -213,9 +232,9 @@
for (int j = 0; j < resources.length; j++) {
IResource res = project.findMember(resources[j]);
if (res != null) {
- ArrayList list = (ArrayList) classpathMap.get(res.getFullPath());
+ Collection list = (Collection) classpathMap.get(res.getFullPath());
if (list != null) {
- ListIterator li = list.listIterator();
+ Iterator li = list.iterator();
while (li.hasNext())
paths.add(li.next());
}
@@ -231,11 +250,13 @@
IResource res = project.findMember(libName);
if (res != null)
path = res.getFullPath();
+ else
+ path = new Path(libName);
}
- ArrayList list = (ArrayList) classpathMap.get(path);
+ Collection list = (Collection) classpathMap.get(path);
if (list != null) {
- ListIterator li = list.listIterator();
+ Iterator li = list.iterator();
while (li.hasNext())
paths.add(li.next());
}
@@ -271,7 +292,7 @@
Iterator iterator = classpathMap.values().iterator();
List collect = new ArrayList();
while (iterator.hasNext()) {
- ArrayList list = (ArrayList) iterator.next();
+ Collection list = (Collection) iterator.next();
collect.addAll(list);
}
paths = (IPath[]) collect.toArray(new IPath[collect.size()]);
diff --git src/org/eclipse/pde/internal/core/PDECore.java src/org/eclipse/pde/internal/core/PDECore.java
index 2cf46d5..7a13fd6 100644
--- src/org/eclipse/pde/internal/core/PDECore.java
+++ src/org/eclipse/pde/internal/core/PDECore.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -17,6 +17,7 @@
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.pde.core.IBundleClasspathResolver;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.project.IBundleProjectService;
import org.eclipse.pde.internal.core.builders.FeatureRebuilder;
@@ -130,6 +131,7 @@
private SourceLocationManager fSourceLocationManager;
private JavadocLocationManager fJavadocLocationManager;
private SearchablePluginsManager fSearchablePluginsManager;
+ private ClasspathContainerResolverManager fClasspathContainerResolverManager;
// Tracing options manager
private TracingOptionsManager fTracingOptionsManager;
@@ -215,6 +217,20 @@
return fSourceLocationManager;
}
+ /**
+ * Returns the singleton instance of the classpath container resolver manager used to dynamically
+ * resolve a project's classpath. Clients may contribute a {@link IBundleClasspathResolver} to the
+ * manager through the org.eclipse.pde.core.bundleClasspathResolvers extension.
+ *
+ * @return singleton instance of the classpath container resolver manager
+ */
+ public synchronized ClasspathContainerResolverManager getClasspathContainerResolverManager() {
+ if (fClasspathContainerResolverManager == null) {
+ fClasspathContainerResolverManager = new ClasspathContainerResolverManager();
+ }
+ return fClasspathContainerResolverManager;
+ }
+
public synchronized JavadocLocationManager getJavadocLocationManager() {
if (fJavadocLocationManager == null)
fJavadocLocationManager = new JavadocLocationManager();
diff --git src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupDirector.java src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupDirector.java
index f01326f..e60dda0 100644
--- src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupDirector.java
+++ src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupDirector.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * Copyright (c) 2005, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,8 +10,6 @@
* Code 9 Corporation - ongoing enhancements
*******************************************************************************/
package org.eclipse.pde.internal.launching.sourcelookup;
-
-import org.eclipse.pde.internal.launching.PDELaunchingPlugin;
import java.io.File;
import java.util.*;
@@ -25,9 +23,10 @@
import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.jdt.launching.sourcelookup.containers.JavaSourceLookupParticipant;
+import org.eclipse.pde.core.IBundleClasspathResolver;
import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.PDEClasspathContainer;
-import org.eclipse.pde.internal.core.TargetPlatformHelper;
+import org.eclipse.pde.internal.core.*;
+import org.eclipse.pde.internal.launching.PDELaunchingPlugin;
public class PDESourceLookupDirector extends AbstractSourceLookupDirector {
@@ -209,6 +208,12 @@
result.add(rte);
}
}
+
+ // Add additional entries from contributed classpath container resolvers
+ IBundleClasspathResolver[] resolvers = PDECore.getDefault().getClasspathContainerResolverManager().getBundleClasspathResolvers(project);
+ for (int i = 0; i < resolvers.length; i++) {
+ result.addAll(resolvers[i].getAdditionalSourceEntries(jProject));
+ }
}
/* (non-Javadoc)