tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r718696 - in /tuscany/branches/sca-equinox/modules: binding-jms-runtime/META-INF/ binding-sca-corba/META-INF/ binding-ws-axis2/META-INF/ binding-ws-xml/META-INF/ databinding-axiom/META-INF/ databinding-jaxb-axiom/META-INF/ databinding-json/...
Date Tue, 18 Nov 2008 19:59:01 GMT
Author: rfeng
Date: Tue Nov 18 11:59:00 2008
New Revision: 718696

URL: http://svn.apache.org/viewvc?rev=718696&view=rev
Log:
Fix the duplicate export package from 3rd party jars
Remove the version from javax.xml.stream Import-Package

Modified:
    tuscany/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
    tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
    tuscany/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF

Modified: tuscany/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF?rev=718696&r1=718695&r2=718696&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF Tue Nov
18 11:59:00 2008
@@ -20,7 +20,7 @@
 Bundle-Description: Apache Tuscany SCA JMS Binding Runtime
 Import-Package: javax.jms,
  javax.naming,
- javax.xml.stream;version="1.0",
+ javax.xml.stream,
  org.apache.axiom.om,
  org.apache.axiom.om.impl.builder,
  org.apache.tuscany.sca.assembly;version="1.4",

Modified: tuscany/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF?rev=718696&r1=718695&r2=718696&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF Tue Nov 18
11:59:00 2008
@@ -12,7 +12,7 @@
 Bundle-Description: Apache Tuscany SCA CORBA-based Default Binding Ext
  ension
 Import-Package: javax.xml.namespace;version="1.0",
- javax.xml.stream;version="1.0",
+ javax.xml.stream,
  org.apache.axiom.om,
  org.apache.axiom.om.impl.builder,
  org.apache.tuscany.sca.assembly;version="1.4",

Modified: tuscany/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF?rev=718696&r1=718695&r2=718696&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF Tue Nov 18
11:59:00 2008
@@ -51,7 +51,7 @@
  javax.wsdl.factory;resolution:=optional,
  javax.wsdl.xml;resolution:=optional,
  javax.xml.namespace;version="1.0",
- javax.xml.stream;version="1.0",
+ javax.xml.stream,
  javax.xml.transform,
  javax.xml.transform.dom,
  org.apache.axiom.om,

Modified: tuscany/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF?rev=718696&r1=718695&r2=718696&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF Tue Nov 18 11:59:00
2008
@@ -12,7 +12,7 @@
 Import-Package: javax.wsdl,
  javax.xml.namespace;version="1.0",
  javax.xml.parsers,
- javax.xml.stream;version="1.0",
+ javax.xml.stream,
  javax.xml.transform,
  javax.xml.transform.dom,
  org.apache.tuscany.sca.assembly;version="1.4",

Modified: tuscany/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF?rev=718696&r1=718695&r2=718696&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF Tue Nov 18
11:59:00 2008
@@ -14,7 +14,7 @@
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Data Binding for Axiom
-Import-Package: javax.xml.namespace,javax.xml.stream;version="1.0",org
+Import-Package: javax.xml.namespace,javax.xml.stream,org
  .apache.axiom.om,org.apache.axiom.om.impl.builder,org.apache.tuscany.
  sca.databinding;version="1.4",org.apache.tuscany.sca.databinding.axio
  m;version="1.4",org.apache.tuscany.sca.databinding.impl;version="1.4"

Modified: tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF?rev=718696&r1=718695&r2=718696&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF Tue Nov
18 11:59:00 2008
@@ -16,7 +16,7 @@
  javax.xml.bind.attachment,
  javax.xml.datatype;resolution:=optional,
  javax.xml.namespace,
- javax.xml.stream;version="1.0",
+ javax.xml.stream,
  javax.xml.transform,
  javax.xml.transform.stream,
  org.apache.axiom.om,

Modified: tuscany/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF?rev=718696&r1=718695&r2=718696&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF Tue Nov 18
11:59:00 2008
@@ -12,8 +12,7 @@
 Bundle-Description: Apache Tuscany SCA Data Binding for JSON
 Import-Package: com.metaparadigm.jsonrpc,
  javax.xml.namespace,
- javax.xml.stream;version="1.0",
- 
+ javax.xml.stream,
  org.apache.axiom.om,
  org.apache.tuscany.sca.databinding;version="1.4",
  org.apache.tuscany.sca.databinding.impl;version="1.4",

Modified: tuscany/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF?rev=718696&r1=718695&r2=718696&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF Tue Nov
18 11:59:00 2008
@@ -16,7 +16,7 @@
  commonj.sdo.helper;version="2.1",
  commonj.sdo.impl;resolution:=optional,
  javax.xml.namespace,
- javax.xml.stream;version="1.0",
+ javax.xml.stream,
  
  org.apache.axiom.om,
  org.apache.axiom.om.impl.builder,

Modified: tuscany/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java?rev=718696&r1=718695&r2=718696&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
(original)
+++ tuscany/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
Tue Nov 18 11:59:00 2008
@@ -23,15 +23,11 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.net.URL;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -224,7 +220,7 @@
                         try {
                             bundle.start();
                         } catch (BundleException e) {
-                            throw new IllegalStateException(e);
+                            logger.log(Level.SEVERE, e.getMessage(), e);
                         }
                         // urls = Collections.enumeration(Arrays.asList(entry));
                     }

Modified: tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java?rev=718696&r1=718695&r2=718696&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
(original)
+++ tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
Tue Nov 18 11:59:00 2008
@@ -301,8 +301,6 @@
 
             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 @@
                     imports.append(importPackage);
                     imports.append(',');
                     importPackages.add(importPackage);
+                    exports.append(pkg);
+                    exports.append(',');
+                } else {
+                    logger.warning("Duplicate package skipped: " + pkg);
                 }
             }
 

Modified: tuscany/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF?rev=718696&r1=718695&r2=718696&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF Tue Nov 18
11:59:00 2008
@@ -18,7 +18,7 @@
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany Security Policy WS Model
 Import-Package: javax.xml.namespace;version="1.0",
- javax.xml.stream;version="1.0",
+ javax.xml.stream,
  org.apache.axiom.om,
  org.apache.axis2,
  org.apache.axis2.context,

Modified: tuscany/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF?rev=718696&r1=718695&r2=718696&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF Tue Nov 18 11:59:00
2008
@@ -10,7 +10,7 @@
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Policy XML WS Model
 Import-Package: javax.xml.namespace,
- javax.xml.stream;version="1.0",
+ javax.xml.stream,
  org.apache.axiom.om,
  org.apache.neethi,
  org.apache.tuscany.sca.contribution.processor;version="1.4",



Mime
View raw message