You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rs...@apache.org on 2008/04/16 09:22:54 UTC
svn commit: r648576 -
/incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
Author: rsivaram
Date: Wed Apr 16 00:22:51 2008
New Revision: 648576
URL: http://svn.apache.org/viewvc?rev=648576&view=rev
Log:
Set embedded jar names in OSGi wrapper bundles used for contribution interoperability
Modified:
incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
Modified: incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java?rev=648576&r1=648575&r2=648576&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java Wed Apr 16 00:22:51 2008
@@ -142,7 +142,12 @@
String EOL = System.getProperty("line.separator");
String bundleName = contribution.getURI();
- String uri = contribution.getURI();
+ URL contribURL = new URL(contribution.getLocation());
+ String contribName = contribURL.getPath();
+ if (contribName.endsWith("/"))
+ contribName = contribName.substring(0, contribName.length()-1);
+ if (contribName.lastIndexOf("/") >= 0)
+ contribName = contribName.substring(contribName.lastIndexOf("/")+1);
StringBuffer exportPackageNames = new StringBuffer();
for (Export export : contribution.getExports()) {
@@ -181,7 +186,7 @@
manifestBuf.append(manifestStr);
manifestBuf.append("Export-Package: " + exportPackageNames + EOL);
manifestBuf.append("Import-Package: " + importPackageNames + EOL);
- manifestBuf.append("Bundle-ClassPath: .," + uri + EOL);
+ manifestBuf.append("Bundle-ClassPath: .," + contribName + EOL);
ByteArrayInputStream manifestStream = new ByteArrayInputStream(manifestBuf.toString().getBytes());
Manifest manifest = new Manifest();
@@ -189,10 +194,9 @@
JarOutputStream jarOut = new JarOutputStream(out, manifest);
- ZipEntry ze = new ZipEntry(uri);
+ ZipEntry ze = new ZipEntry(contribName);
jarOut.putNextEntry(ze);
- URL url = new URL(contribution.getLocation());
- InputStream stream = url.openStream();
+ InputStream stream = contribURL.openStream();
byte[] bytes = new byte[stream.available()];
stream.read(bytes);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org