From ab830bb318a95f46748f45afcc5706c15f1f9f3c Mon Sep 17 00:00:00 2001 From: rfeng Date: Wed, 28 Jan 2009 00:53:49 +0000 Subject: Make tuscany modules as fragments to axis2 and axiom bunldes to work around the axis2/axiom classloading issues git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@738327 13f79535-47bb-0310-9956-ffa450edef68 --- .../modules/binding-ws-axis2/META-INF/MANIFEST.MF | 1 + .../modules/databinding-axiom/META-INF/MANIFEST.MF | 21 +++++--- .../sca/node/equinox/launcher/EquinoxHost.java | 60 +--------------------- 3 files changed, 15 insertions(+), 67 deletions(-) (limited to 'java/sca') diff --git a/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF b/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF index 0b335660ac..e5539f811c 100644 --- a/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF +++ b/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF @@ -148,4 +148,5 @@ Import-Package: javax.security.auth.callback;resolution:=optional, org.w3c.dom, org.xml.sax Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.axis2 +Fragment-Host: org.apache.axis2.kernel Bundle-DocURL: http://www.apache.org/ diff --git a/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF b/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF index b28e52933d..cee050a139 100644 --- a/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF +++ b/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF @@ -14,14 +14,19 @@ 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,org - .apache.axiom.om,org.apache.axiom.om.impl.builder,org.apache.tuscany. - sca.databinding;version="2.0.0",org.apache.tuscany.sca.databinding.axio - m;version="2.0.0",org.apache.tuscany.sca.databinding.impl;version="2.0.0" - ,org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",org.apach - e.tuscany.sca.interfacedef;version="2.0.0",org.apache.tuscany.sca.inter - facedef.impl;version="2.0.0",org.apache.tuscany.sca.interfacedef.util;v - ersion="1.4" +Import-Package: javax.xml.namespace, + javax.xml.stream, + org.apache.axiom.om, + org.apache.axiom.om.impl.builder, + org.apache.tuscany.sca.databinding;version="2.0.0", + org.apache.tuscany.sca.databinding.axiom;version="2.0.0", + org.apache.tuscany.sca.databinding.impl;version="2.0.0", + org.apache.tuscany.sca.databinding.javabeans;version="2.0.0", + org.apache.tuscany.sca.interfacedef;version="2.0.0", + org.apache.tuscany.sca.interfacedef.impl;version="2.0.0", + org.apache.tuscany.sca.interfacedef.util;version="1.4", + org.apache.axiom.soap.impl.llom.soap11;resolution:=optional Bundle-SymbolicName: org.apache.tuscany.sca.databinding.axiom +Fragment-Host: org.apache.ws.commons.axiom.axiom-api Bundle-DocURL: http://www.apache.org/ diff --git a/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java b/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java index bb53de2e5a..b069081a3d 100644 --- a/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java +++ b/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java @@ -74,60 +74,6 @@ public class EquinoxHost { private Map allBundles = new HashMap(); private List installedBundles = new ArrayList(); - /* - private final static String systemPackages = - "org.osgi.framework; version=1.3.0," - + "org.osgi.service.packageadmin; version=1.2.0, " - + "org.osgi.service.startlevel; version=1.0.0, " - + "org.osgi.service.url; version=1.0.0, " - + "org.osgi.util.tracker; version=1.3.2, " - + "javax.xml, " - + "javax.xml.datatype, " - + "javax.xml.namespace, " - + "javax.xml.parsers, " - + "javax.xml.transform, " - + "javax.xml.transform.dom, " - + "javax.xml.transform.sax, " - + "javax.xml.transform.stream, " - + "javax.xml.validation, " - + "javax.xml.xpath, " - // Force the classes to be imported from the system bundle - + "javax.xml.stream, " - + "javax.xml.stream.util, " - + "javax.sql," - + "org.w3c.dom, " - + "org.xml.sax, " - + "org.xml.sax.ext, " - + "org.xml.sax.helpers, " - + "javax.security.auth, " - + "javax.security.cert, " - + "javax.security.auth.login, " - + "javax.security.auth.callback, " - + "javax.naming, " - + "javax.naming.spi, " - + "javax.naming.directory, " - + "javax.management, " - + "javax.imageio, " - + "sun.misc, " - + "javax.net, " - + "javax.net.ssl, " - + "javax.crypto, " - + "javax.rmi, " - //+ "javax.transaction, " - //+ "javax.transaction.xa, " - + "org.omg.CosNaming, " - + "org.omg.CORBA, " - + "org.omg.CORBA.portable, " - + "org.omg.PortableServer, " - + "org.omg.CosNaming, " - + "org.omg.CosNaming.NamingContextExtPackage, " - + "org.omg.CosNaming.NamingContextPackage, " - + "org.omg.CORBA_2_3.portable, " - + "org.omg.IOP, " - + "org.omg.PortableInterceptor, " - + "org.omg.stub.java.rmi, " - + "javax.rmi.CORBA"; - */ public EquinoxHost() { super(); } @@ -168,15 +114,11 @@ public class EquinoxHost { // Configure Eclipse properties // Use the boot classloader as the parent classloader - props.put("osgi.contextClassLoaderParent", "boot"); + props.put("osgi.contextClassLoaderParent", "app"); // Set startup properties props.put(EclipseStarter.PROP_CLEAN, "true"); - if (logger.isLoggable(Level.FINE)) { - props.put("osgi.console", "8085"); - } - // Set location properties // FIXME Use proper locations String tmpDir = getSystemProperty("java.io.tmpdir"); -- cgit v1.2.3