You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/07/09 23:46:18 UTC
[05/50] git commit: some helpers to extract exported packages from
osgi
some helpers to extract exported packages from osgi
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/bf0a0673
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/bf0a0673
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/bf0a0673
Branch: refs/heads/master
Commit: bf0a06731333ba6eb334395cfc0f793a55da5591
Parents: 9b93d30
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Jul 4 16:46:29 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 9 22:34:42 2014 +0100
----------------------------------------------------------------------
.../src/main/java/brooklyn/util/osgi/Osgis.java | 64 ++++++++++++++++++++
.../management/osgi/OsgiStandaloneTest.java | 26 ++++++++
2 files changed, 90 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bf0a0673/core/src/main/java/brooklyn/util/osgi/Osgis.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/util/osgi/Osgis.java b/core/src/main/java/brooklyn/util/osgi/Osgis.java
index b67455a..b15365c 100644
--- a/core/src/main/java/brooklyn/util/osgi/Osgis.java
+++ b/core/src/main/java/brooklyn/util/osgi/Osgis.java
@@ -19,18 +19,25 @@
package brooklyn.util.osgi;
import java.io.BufferedReader;
+import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.List;
import java.util.Map;
+import java.util.jar.Manifest;
+
+import javax.annotation.Nullable;
import org.apache.felix.framework.FrameworkFactory;
+import org.apache.felix.framework.util.StringMap;
+import org.apache.felix.framework.util.manifestparser.ManifestParser;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
import org.osgi.framework.launch.Framework;
+import org.osgi.framework.wiring.BundleCapability;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,6 +46,7 @@ import brooklyn.util.collections.MutableList;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.guava.Maybe;
+import brooklyn.util.stream.Streams;
import com.google.common.annotations.Beta;
import com.google.common.base.Joiner;
@@ -172,4 +180,60 @@ public class Osgis {
return framework.getBundleContext().installBundle(url, stream);
}
+ public static class ManifestHelper {
+
+ private static ManifestParser parse;
+ private Manifest manifest;
+ private String source;
+
+ private static final String WIRING_PACKAGE = "osgi.wiring.package";
+
+ public static ManifestHelper forManifestContents(String contents) throws IOException, BundleException {
+ ManifestHelper result = forManifest(Streams.newInputStreamWithContents(contents));
+ result.source = contents;
+ return result;
+ }
+
+ public static ManifestHelper forManifest(InputStream in) throws IOException, BundleException {
+ return forManifest(new Manifest(in));
+ }
+
+ public static ManifestHelper forManifest(Manifest manifest) throws BundleException {
+ ManifestHelper result = new ManifestHelper();
+ result.manifest = manifest;
+ parse = new ManifestParser(null, null, null, new StringMap(manifest.getMainAttributes()));
+ return result;
+ }
+
+ public String getSymbolicName() {
+ return parse.getSymbolicName();
+ }
+
+ public Version getVersion() {
+ return parse.getBundleVersion();
+ }
+
+ public String getSymbolicNameVersion() {
+ return getSymbolicName()+":"+getVersion();
+ }
+
+ public List<String> getExportedPackages() {
+ MutableList<String> result = MutableList.of();
+ for (BundleCapability c: parse.getCapabilities()) {
+ if (WIRING_PACKAGE.equals(c.getNamespace())) {
+ result.add((String)c.getAttributes().get(WIRING_PACKAGE));
+ }
+ }
+ return result;
+ }
+
+ @Nullable public String getSource() {
+ return source;
+ }
+
+ public Manifest getManifest() {
+ return manifest;
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bf0a0673/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java b/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java
index 7ada27a..8b8bb0d 100644
--- a/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java
+++ b/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java
@@ -20,18 +20,26 @@ package brooklyn.management.osgi;
import java.io.File;
import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.List;
import org.apache.commons.io.FileUtils;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.launch.Framework;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import brooklyn.util.collections.MutableSet;
import brooklyn.util.os.Os;
import brooklyn.util.osgi.Osgis;
+import brooklyn.util.osgi.Osgis.ManifestHelper;
+import brooklyn.util.stream.Streams;
/** tests some assumptions about OSGi behaviour, in standalone mode (not part of brooklyn).
*
@@ -44,6 +52,8 @@ import brooklyn.util.osgi.Osgis;
* */
public class OsgiStandaloneTest {
+ private static final Logger log = LoggerFactory.getLogger(OsgiStandaloneTest.class);
+
public static final String BROOKLYN_OSGI_TEST_A_0_1_0_URL = "classpath:///brooklyn/osgi/brooklyn-osgi-test-a_0.1.0.jar";
protected Framework framework = null;
@@ -134,5 +144,21 @@ public class OsgiStandaloneTest {
Class<?> aClass = bundle.loadClass("brooklyn.test.osgi.TestA");
aClass.getField("multiplier").set(null, newMultiplier);
}
+
+ @Test
+ public void testReadAManifest() throws Exception {
+ Enumeration<URL> manifests = getClass().getClassLoader().getResources("META-INF/MANIFEST.MF");
+ log.info("Bundles and exported packages:");
+ MutableSet<String> allPackages = MutableSet.of();
+ while (manifests.hasMoreElements()) {
+ ManifestHelper mf = Osgis.ManifestHelper.forManifestContents(Streams.readFullyString( manifests.nextElement().openStream() ));
+ List<String> mfPackages = mf.getExportedPackages();
+ log.info(" "+mf.getSymbolicNameVersion()+": "+mfPackages);
+ allPackages.addAll(mfPackages);
+ }
+ log.info("Total export package count: "+allPackages.size());
+ Assert.assertTrue(allPackages.size()>20, "did not find enough packages"); // probably much larger
+ Assert.assertTrue(allPackages.contains(Osgis.class.getPackage().getName()));
+ }
}