From 146d6718330958411e6b7709e3da9fcab106b576 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 18 Nov 2008 19:59:00 +0000
Subject: Fix the duplicate export package from 3rd party jars Remove the
 version from javax.xml.stream Import-Package

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@718696 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'branches/sca-equinox/modules/node-launcher-equinox/src/main/java')

diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java b/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
index daad3da85a..93f1b01206 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
+++ b/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
@@ -301,8 +301,6 @@ final class NodeLauncherUtil {
 
             Set<String> importPackages = new HashSet<String>();
             for (String pkg : packages) {
-                exports.append(pkg);
-                exports.append(',');
 
                 String importPackage = pkg;
                 int index = pkg.indexOf(';');
@@ -313,6 +311,10 @@ final class NodeLauncherUtil {
                     imports.append(importPackage);
                     imports.append(',');
                     importPackages.add(importPackage);
+                    exports.append(pkg);
+                    exports.append(',');
+                } else {
+                    logger.warning("Duplicate package skipped: " + pkg);
                 }
             }
 
-- 
cgit v1.2.3