diff options
Diffstat (limited to 'branches')
12 files changed, 15 insertions, 18 deletions
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF index 77603a635d..73da347ab4 100644 --- a/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt 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",
diff --git a/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF index f13a6f40d5..f3d650a7fb 100644 --- a/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt 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",
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF index 1ab1663121..4ad0490a07 100644 --- a/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF @@ -51,7 +51,7 @@ Import-Package: javax.security.auth.callback;resolution:=optional, 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,
diff --git a/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF index 21bd559fdc..3f6574e1e5 100644 --- a/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Bundle-Description: Apache Tuscany SCA WS Binding XML Model 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",
diff --git a/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF index 531d72f3a0..27299b7b8f 100644 --- a/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Bnd-LastModified: 1225397285015 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"
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF index 636cbe1283..30269ccdca 100644 --- a/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Import-Package: javax.xml.bind, 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,
diff --git a/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF index 89670b57f8..c60394a1ae 100644 --- a/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF @@ -12,8 +12,7 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt 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",
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF index dc6a72a772..01d84174ee 100644 --- a/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Import-Package: commonj.sdo;version="2.1", 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,
diff --git a/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java b/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java index 3d33782a29..bb77b77d0c 100644 --- a/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java +++ b/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java @@ -23,15 +23,11 @@ import java.io.BufferedReader; 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 @@ public class EquinoxServiceDiscoverer implements ServiceDiscoverer { try { bundle.start(); } catch (BundleException e) { - throw new IllegalStateException(e); + logger.log(Level.SEVERE, e.getMessage(), e); } // urls = Collections.enumeration(Arrays.asList(entry)); } 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); } } diff --git a/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF index 85796bc6d5..40f58929d2 100644 --- a/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Bundle-ManifestVersion: 2 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,
diff --git a/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF index 4545d9a2a2..6241096ee8 100644 --- a/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-ManifestVersion: 2 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",
|