Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Lippert2009-04-29 21:56:04 +0000
committerMartin Lippert2009-04-29 21:56:04 +0000
commit9c6314ef54016178bf5f7af82b6f935aeae8fad6 (patch)
tree205585946f7a587dbfd2dd4700bd8a8c21fa090a
parent8818e474d051115b06cf06dae2db3588d8311626 (diff)
downloadrt.equinox.bundles-9c6314ef54016178bf5f7af82b6f935aeae8fad6.tar.gz
rt.equinox.bundles-9c6314ef54016178bf5f7af82b6f935aeae8fad6.tar.xz
rt.equinox.bundles-9c6314ef54016178bf5f7af82b6f935aeae8fad6.zip
Bug 271031 - [aspects] aspects in fragments not found
-rw-r--r--bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/AspectResolver.java12
-rw-r--r--bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/service/weaving/ISupplementerRegistry.java33
-rw-r--r--bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/service/weaving/Supplementer.java (renamed from bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/Supplementer.java)18
-rw-r--r--bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/SupplementerRegistry.java142
-rw-r--r--bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/WeavingLoaderDelegateHook.java21
5 files changed, 128 insertions, 98 deletions
diff --git a/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/AspectResolver.java b/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/AspectResolver.java
index 983e19495..ba221cda3 100644
--- a/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/AspectResolver.java
+++ b/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/AspectResolver.java
@@ -6,7 +6,8 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Martin Lippert initial implementation
+ * Martin Lippert initial implementation
+ * Martin Lippert fragment handling fixed
*******************************************************************************/
package org.eclipse.equinox.weaving.aspectj.loadtime;
@@ -18,6 +19,7 @@ import java.util.List;
import org.aspectj.weaver.loadtime.definition.Definition;
import org.eclipse.equinox.service.weaving.ISupplementerRegistry;
+import org.eclipse.equinox.service.weaving.Supplementer;
import org.eclipse.equinox.weaving.aspectj.AspectAdmin;
import org.eclipse.equinox.weaving.aspectj.AspectConfiguration;
import org.eclipse.osgi.service.resolver.BundleDescription;
@@ -220,17 +222,19 @@ public class AspectResolver {
}
// supplementers
- final Bundle[] supplementers = this.supplementerRegistry
+ final Supplementer[] supplementers = this.supplementerRegistry
.getSupplementers(bundleDescription.getBundleId());
for (int i = 0; i < supplementers.length; i++) {
aspects = aspectAdmin
- .getExportedAspectDefinitions(supplementers[i]);
+ .getExportedAspectDefinitions(supplementers[i]
+ .getSupplementerBundle());
if (aspects != null) {
result.add(aspects);
fingerprintElements.add(supplementers[i].getSymbolicName()
+ ":" //$NON-NLS-1$
- + getBundleVersion(supplementers[i]));
+ + getBundleVersion(supplementers[i]
+ .getSupplementerBundle()));
}
}
diff --git a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/service/weaving/ISupplementerRegistry.java b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/service/weaving/ISupplementerRegistry.java
index 82335817d..a1db9ae6b 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/service/weaving/ISupplementerRegistry.java
+++ b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/service/weaving/ISupplementerRegistry.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Martin Lippert 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Martin Lippert initial implementation
+ *******************************************************************************/
package org.eclipse.equinox.service.weaving;
@@ -16,20 +26,15 @@ public interface ISupplementerRegistry {
public void addSupplementer(final Bundle bundle, final boolean updateBundles);
- public PackageAdmin getPackageAdmin();
-
- public Bundle[] getSupplementers(final Bundle bundle);
-
- public Bundle[] getSupplementers(final long bundleID);
-
- public List getSupplementers(final String symbolicName,
- final ManifestElement[] imports, final ManifestElement[] exports);
+ public List<Supplementer> getMatchingSupplementers(
+ final String symbolicName, final ManifestElement[] imports,
+ final ManifestElement[] exports);
- public void removeBundle(final Bundle bundle);
+ public PackageAdmin getPackageAdmin();
- public void setBundleContext(final BundleContext context);
+ public Supplementer[] getSupplementers(final Bundle bundle);
- public void setPackageAdmin(final PackageAdmin packageAdmin);
+ public Supplementer[] getSupplementers(final long bundleID);
/**
* Refreshes the given bundles
@@ -38,4 +43,10 @@ public interface ISupplementerRegistry {
*/
public void refreshBundles(final Bundle[] bundles);
+ public void removeBundle(final Bundle bundle);
+
+ public void setBundleContext(final BundleContext context);
+
+ public void setPackageAdmin(final PackageAdmin packageAdmin);
+
}
diff --git a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/Supplementer.java b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/service/weaving/Supplementer.java
index 80cafecbc..c6be53adc 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/Supplementer.java
+++ b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/service/weaving/Supplementer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 Martin Lippert and others.
+ * Copyright (c) 2008, 2009 Martin Lippert 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
@@ -8,9 +8,10 @@
* Contributors:
* David Knibb initial implementation
* Martin Lippert supplementing mechanism reworked
+ * Martin Lippert fragment handling fixed
*******************************************************************************/
-package org.eclipse.equinox.weaving.hooks;
+package org.eclipse.equinox.service.weaving;
import java.util.ArrayList;
import java.util.List;
@@ -26,15 +27,18 @@ public class Supplementer {
private final Bundle supplementer;
+ private final Bundle supplementerHost;
+
private final ManifestElement[] supplementExporter;
private final ManifestElement[] supplementImporter;
- public Supplementer(final Bundle bundle,
+ public Supplementer(final Bundle bundle, final Bundle bundleHost,
final ManifestElement[] supplementBundle,
final ManifestElement[] supplementImporter,
final ManifestElement[] supplementExporter) {
this.supplementer = bundle;
+ this.supplementerHost = bundleHost != null ? bundleHost : bundle;
this.supplementBundle = supplementBundle;
this.supplementImporter = supplementImporter;
this.supplementExporter = supplementExporter;
@@ -46,14 +50,18 @@ public class Supplementer {
}
public Bundle[] getSupplementedBundles() {
- return supplementedBundles
- .toArray(new Bundle[supplementedBundles.size()]);
+ return supplementedBundles.toArray(new Bundle[supplementedBundles
+ .size()]);
}
public Bundle getSupplementerBundle() {
return supplementer;
}
+ public Bundle getSupplementerHost() {
+ return supplementerHost;
+ }
+
public String getSymbolicName() {
return supplementer.getSymbolicName();
}
diff --git a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/SupplementerRegistry.java b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/SupplementerRegistry.java
index 0fb3ff4a4..4726309fe 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/SupplementerRegistry.java
+++ b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/SupplementerRegistry.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 Martin Lippert and others.
+ * Copyright (c) 2008, 2009 Martin Lippert 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
@@ -9,6 +9,7 @@
* Matthew Webster initial implementation
* Martin Lippert supplementing mechanism reworked
* Heiko Seeberger Enhancements for service dynamics
+ * Martin Lippert fragment handling fixed
*******************************************************************************/
package org.eclipse.equinox.weaving.hooks;
@@ -26,6 +27,7 @@ import java.util.Map;
import java.util.Set;
import org.eclipse.equinox.service.weaving.ISupplementerRegistry;
+import org.eclipse.equinox.service.weaving.Supplementer;
import org.eclipse.osgi.util.ManifestElement;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -82,13 +84,13 @@ public class SupplementerRegistry implements ISupplementerRegistry {
private final Map<String, Supplementer> supplementers; // keys of type String (symbolic name of supplementer bundle), values of type Supplementer
- private final Map<Long, Bundle[]> supplementersByBundle;
+ private final Map<Long, Supplementer[]> supplementersByBundle;
public SupplementerRegistry(final IAdaptorProvider adaptorProvider) {
this.adaptorProvider = adaptorProvider;
this.supplementers = new HashMap<String, Supplementer>();
- this.supplementersByBundle = new HashMap<Long, Bundle[]>();
+ this.supplementersByBundle = new HashMap<Long, Supplementer[]>();
this.dontWeaveTheseBundles = new HashSet<String>();
this.dontWeaveTheseBundles.add("org.eclipse.osgi");
@@ -129,13 +131,13 @@ public class SupplementerRegistry implements ISupplementerRegistry {
final ManifestElement[] exports = ManifestElement.parseHeader(
Constants.EXPORT_PACKAGE, (String) manifest
.get(Constants.EXPORT_PACKAGE));
- final List<Bundle> supplementers = getSupplementers(bundle
- .getSymbolicName(), imports, exports);
+ final List<Supplementer> supplementers = getMatchingSupplementers(
+ bundle.getSymbolicName(), imports, exports);
if (supplementers.size() > 0) {
this.addSupplementedBundle(bundle, supplementers);
}
this.supplementersByBundle.put(bundle.getBundleId(), supplementers
- .toArray(new Bundle[supplementers.size()]));
+ .toArray(new Supplementer[supplementers.size()]));
} catch (final BundleException e) {
}
}
@@ -159,8 +161,13 @@ public class SupplementerRegistry implements ISupplementerRegistry {
if (supplementBundle != null || supplementImporter != null
|| supplementExporter != null) {
+
+ final Bundle[] hosts = this.packageAdmin.getHosts(bundle);
+ final Bundle host = hosts != null && hosts.length == 1 ? hosts[0]
+ : null;
+
final Supplementer newSupplementer = new Supplementer(bundle,
- supplementBundle, supplementImporter,
+ host, supplementBundle, supplementImporter,
supplementExporter);
this.supplementers.put(bundle.getSymbolicName(),
@@ -174,6 +181,32 @@ public class SupplementerRegistry implements ISupplementerRegistry {
}
/**
+ * @see org.eclipse.equinox.service.weaving.ISupplementerRegistry#getMatchingSupplementers(java.lang.String,
+ * org.eclipse.osgi.util.ManifestElement[],
+ * org.eclipse.osgi.util.ManifestElement[])
+ */
+ public List<Supplementer> getMatchingSupplementers(
+ final String symbolicName, final ManifestElement[] imports,
+ final ManifestElement[] exports) {
+ List<Supplementer> result = Collections.emptyList();
+
+ if (supplementers.size() > 0
+ && !this.dontWeaveTheseBundles.contains(symbolicName)) {
+ result = new LinkedList<Supplementer>();
+ for (final Iterator<Supplementer> i = supplementers.values()
+ .iterator(); i.hasNext();) {
+ final Supplementer supplementer = i.next();
+ if (isSupplementerMatching(symbolicName, imports, exports,
+ supplementer)) {
+ result.add(supplementer);
+ }
+ }
+ }
+
+ return result;
+ }
+
+ /**
* @see org.eclipse.equinox.service.weaving.ISupplementerRegistry#getPackageAdmin()
*/
public PackageAdmin getPackageAdmin() {
@@ -183,44 +216,19 @@ public class SupplementerRegistry implements ISupplementerRegistry {
/**
* @see org.eclipse.equinox.service.weaving.ISupplementerRegistry#getSupplementers(org.osgi.framework.Bundle)
*/
- public Bundle[] getSupplementers(final Bundle bundle) {
+ public Supplementer[] getSupplementers(final Bundle bundle) {
return getSupplementers(bundle.getBundleId());
}
/**
* @see org.eclipse.equinox.service.weaving.ISupplementerRegistry#getSupplementers(long)
*/
- public Bundle[] getSupplementers(final long bundleID) {
+ public Supplementer[] getSupplementers(final long bundleID) {
if (supplementersByBundle.containsKey(bundleID)) {
return supplementersByBundle.get(bundleID);
} else {
- return new Bundle[0];
- }
- }
-
- /**
- * @see org.eclipse.equinox.service.weaving.ISupplementerRegistry#getSupplementers(java.lang.String,
- * org.eclipse.osgi.util.ManifestElement[],
- * org.eclipse.osgi.util.ManifestElement[])
- */
- public List<Bundle> getSupplementers(final String symbolicName,
- final ManifestElement[] imports, final ManifestElement[] exports) {
- List<Bundle> result = Collections.emptyList();
-
- if (supplementers.size() > 0
- && !this.dontWeaveTheseBundles.contains(symbolicName)) {
- result = new LinkedList<Bundle>();
- for (final Iterator<Supplementer> i = supplementers.values()
- .iterator(); i.hasNext();) {
- final Supplementer supplementer = i.next();
- if (isSupplementerMatching(symbolicName, imports, exports,
- supplementer)) {
- result.add(supplementer.getSupplementerBundle());
- }
- }
+ return new Supplementer[0];
}
-
- return result;
}
/**
@@ -244,6 +252,8 @@ public class SupplementerRegistry implements ISupplementerRegistry {
// if this bundle supplements other bundles, remove this supplementer and update the other bundles
if (supplementers.containsKey(bundle.getSymbolicName())) {
+
+ // remove the supplementer from the list of supplementers
final Supplementer supplementer = supplementers.get(bundle
.getSymbolicName());
supplementers.remove(bundle.getSymbolicName());
@@ -252,23 +262,21 @@ public class SupplementerRegistry implements ISupplementerRegistry {
.println("[org.eclipse.equinox.weaving.hook] info removing supplementer " //$NON-NLS-1$
+ bundle.getSymbolicName());
+ // refresh bundles that where supplemented by this bundle
final Bundle[] supplementedBundles = supplementer
.getSupplementedBundles();
if (supplementedBundles != null && supplementedBundles.length > 0) {
refreshBundles(supplementedBundles);
}
- final Iterator<Long> bundles = this.supplementersByBundle.keySet()
- .iterator();
- while (bundles.hasNext()) {
- final Long next = bundles.next();
- final List<Bundle> supplementerList = new ArrayList<Bundle>(
- Arrays.asList(this.supplementersByBundle.get(next)));
- if (supplementerList.contains(bundle)) {
- supplementerList.remove(bundle);
- this.supplementersByBundle.put(next, supplementerList
- .toArray(new Bundle[0]));
- }
+ // remove this supplementer from the list of supplementers per other bundle
+ for (int i = 0; i < supplementedBundles.length; i++) {
+ final long bundleId = supplementedBundles[i].getBundleId();
+ final List<Supplementer> supplementerList = new ArrayList<Supplementer>(
+ Arrays.asList(this.supplementersByBundle.get(bundleId)));
+ supplementerList.remove(supplementer);
+ this.supplementersByBundle.put(bundleId, supplementerList
+ .toArray(new Supplementer[0]));
}
}
}
@@ -288,15 +296,11 @@ public class SupplementerRegistry implements ISupplementerRegistry {
}
private void addSupplementedBundle(final Bundle supplementedBundle,
- final List<Bundle> supplementers) {
- for (final Iterator<Bundle> iterator = supplementers.iterator(); iterator
+ final List<Supplementer> supplementers) {
+ for (final Iterator<Supplementer> iterator = supplementers.iterator(); iterator
.hasNext();) {
- final String supplementersName = iterator.next().getSymbolicName();
- if (this.supplementers.containsKey(supplementersName)) {
- final Supplementer supplementer = this.supplementers
- .get(supplementersName);
- supplementer.addSupplementedBundle(supplementedBundle);
- }
+ final Supplementer supplementer = iterator.next();
+ supplementer.addSupplementedBundle(supplementedBundle);
}
}
@@ -317,9 +321,9 @@ public class SupplementerRegistry implements ISupplementerRegistry {
}
private void removeSupplementedBundle(final Bundle bundle) {
- for (final Iterator iterator = this.supplementers.values().iterator(); iterator
- .hasNext();) {
- final Supplementer supplementer = (Supplementer) iterator.next();
+ for (final Iterator<Supplementer> iterator = this.supplementers
+ .values().iterator(); iterator.hasNext();) {
+ final Supplementer supplementer = iterator.next();
supplementer.removeSupplementedBundle(bundle);
}
}
@@ -333,15 +337,18 @@ public class SupplementerRegistry implements ISupplementerRegistry {
try {
final Bundle bundle = installedBundles[i];
+ // skip the bundle itself, just resupplement already installed bundles
if (bundle.getSymbolicName().equals(
supplementer.getSymbolicName())) {
continue;
}
+ // skip bundles that should not be woven
if (dontWeaveTheseBundles.contains(bundle.getSymbolicName())) {
continue;
}
+ // find out which of the installed bundles matches the new supplementer
final Dictionary<?, ?> manifest = bundle.getHeaders();
final ManifestElement[] imports = ManifestElement.parseHeader(
Constants.IMPORT_PACKAGE, (String) manifest
@@ -356,25 +363,22 @@ public class SupplementerRegistry implements ISupplementerRegistry {
bundlesToRefresh.add(bundle);
} else {
supplementer.addSupplementedBundle(bundle);
- final Bundle[] existingSupplementers = supplementersByBundle
+ final Supplementer[] existingSupplementers = supplementersByBundle
.get(bundle.getBundleId());
- List<Bundle> enhancedSupplementerList = null;
+ List<Supplementer> enhancedSupplementerList = null;
if (existingSupplementers != null) {
- enhancedSupplementerList = new ArrayList<Bundle>(
+ enhancedSupplementerList = new ArrayList<Supplementer>(
Arrays.asList(existingSupplementers));
} else {
- enhancedSupplementerList = new ArrayList<Bundle>();
+ enhancedSupplementerList = new ArrayList<Supplementer>();
}
- if (!enhancedSupplementerList.contains(supplementer
- .getSupplementerBundle())) {
- enhancedSupplementerList.add(supplementer
- .getSupplementerBundle());
+ if (!enhancedSupplementerList.contains(supplementer)) {
+ enhancedSupplementerList.add(supplementer);
}
- this.supplementersByBundle
- .put(bundle.getBundleId(),
- enhancedSupplementerList
- .toArray(new Bundle[0]));
+ this.supplementersByBundle.put(bundle.getBundleId(),
+ enhancedSupplementerList
+ .toArray(new Supplementer[0]));
}
}
diff --git a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/WeavingLoaderDelegateHook.java b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/WeavingLoaderDelegateHook.java
index eb080157d..7f029faae 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/WeavingLoaderDelegateHook.java
+++ b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/WeavingLoaderDelegateHook.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 Martin Lippert and others.
+ * Copyright (c) 2008, 2009 Martin Lippert 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
@@ -7,6 +7,7 @@
*
* Contributors:
* Martin Lippert initial implementation
+ * Martin Lippert fragment handling fixed
*******************************************************************************/
package org.eclipse.equinox.weaving.hooks;
@@ -18,10 +19,10 @@ import java.util.HashSet;
import java.util.Set;
import org.eclipse.equinox.service.weaving.ISupplementerRegistry;
+import org.eclipse.equinox.service.weaving.Supplementer;
import org.eclipse.osgi.framework.adaptor.BundleClassLoader;
import org.eclipse.osgi.framework.adaptor.BundleData;
import org.eclipse.osgi.framework.adaptor.ClassLoaderDelegateHook;
-import org.osgi.framework.Bundle;
/**
* This class implements the delegate hook for the class loader to allow
@@ -92,12 +93,13 @@ public class WeavingLoaderDelegateHook implements ClassLoaderDelegateHook {
postFindClassCalls.get().add(callKey);
try {
- final Bundle[] supplementers = supplementerRegistry
+ final Supplementer[] supplementers = supplementerRegistry
.getSupplementers(bundleID);
if (supplementers != null) {
for (int i = 0; i < supplementers.length; i++) {
try {
- final Class clazz = supplementers[i].loadClass(name);
+ final Class<?> clazz = supplementers[i]
+ .getSupplementerHost().loadClass(name);
if (clazz != null) {
return clazz;
}
@@ -139,12 +141,13 @@ public class WeavingLoaderDelegateHook implements ClassLoaderDelegateHook {
postFindResourceCalls.get().add(callKey);
try {
- final Bundle[] supplementers = supplementerRegistry
+ final Supplementer[] supplementers = supplementerRegistry
.getSupplementers(bundleID);
if (supplementers != null) {
for (int i = 0; i < supplementers.length; i++) {
try {
- final URL resource = supplementers[i].getResource(name);
+ final URL resource = supplementers[i]
+ .getSupplementerHost().getResource(name);
if (resource != null) {
return resource;
}
@@ -177,13 +180,13 @@ public class WeavingLoaderDelegateHook implements ClassLoaderDelegateHook {
postFindResourcesCalls.get().add(callKey);
try {
- final Bundle[] supplementers = supplementerRegistry
+ final Supplementer[] supplementers = supplementerRegistry
.getSupplementers(bundleID);
if (supplementers != null) {
for (int i = 0; i < supplementers.length; i++) {
try {
- final Enumeration resource = supplementers[i]
- .getResources(name);
+ final Enumeration<?> resource = supplementers[i]
+ .getSupplementerHost().getResources(name);
if (resource != null) {
// TODO: if more than one enumeration is found, we should return all items
return resource;

Back to the top