From dc79a3d21e67c8560e2c35451f2b2c58b675f02a Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 15 Sep 2008 06:01:45 +0000 Subject: Applied changes from sca-equinox branch. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695349 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java') diff --git a/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java b/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java index b422651244..bf65c3f323 100644 --- a/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java +++ b/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java @@ -26,11 +26,13 @@ import static org.osgi.framework.Constants.DYNAMICIMPORT_PACKAGE; import static org.osgi.framework.Constants.EXPORT_PACKAGE; import static org.osgi.framework.Constants.IMPORT_PACKAGE; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.lang.reflect.Constructor; import java.net.URI; import java.net.URISyntaxException; @@ -308,11 +310,12 @@ final class NodeLauncherUtil { } } - static byte[] generateBundle(Manifest mf) throws IOException { + static InputStream libraryBundle(String[] jarFiles) throws IOException { ByteArrayOutputStream bos = new ByteArrayOutputStream(); + Manifest mf = libraryManifest(jarFiles); JarOutputStream jos = new JarOutputStream(bos, mf); jos.close(); - return bos.toByteArray(); + return new ByteArrayInputStream(bos.toByteArray()); } /** -- cgit v1.2.3