summaryrefslogtreecommitdiffstats
path: root/maven-plugins
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-07-31 05:50:24 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-07-31 05:50:24 +0000
commitf938b85193af9a74611109ffaea335f372252ada (patch)
tree40ed5d0e806bb78907c40f5edefbe77e9876354a /maven-plugins
parent6e481c109faf970288bae780bea01c236571e277 (diff)
Don't generate Import-Package header for the 3rd party jars so that either local package is used if there are split packages
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@799521 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'maven-plugins')
-rw-r--r--maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/BundleUtil.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/BundleUtil.java b/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/BundleUtil.java
index 813f02a181..c82e10a928 100644
--- a/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/BundleUtil.java
+++ b/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/BundleUtil.java
@@ -198,9 +198,11 @@ final class BundleUtil {
if (exports.length() > 1) {
attributes.putValue(EXPORT_PACKAGE, exports.substring(0, exports.length() - 1));
}
+ /*
if (imports.length() > 1) {
attributes.putValue(IMPORT_PACKAGE, imports.substring(0, imports.length() - 1));
}
+ */
if (classpath.length() > 1) {
attributes.putValue(BUNDLE_CLASSPATH, classpath.substring(0, classpath.length() - 1));
}
@@ -242,12 +244,12 @@ final class BundleUtil {
* @throws IOException
*/
private static void addPackages(File jarFile, Set<String> packages, String version) throws IOException {
- if (getBundleSymbolicName(jarFile) == null) {
+// if (getBundleSymbolicName(jarFile) == null) {
String ver = ";version=" + version;
addAllPackages(jarFile, packages, ver);
- } else {
- addExportedPackages(jarFile, packages);
- }
+// } else {
+// addExportedPackages(jarFile, packages);
+// }
}
/**