Author: rfeng
Date: Wed Jan 28 00:53:49 2009
New Revision: 738327
URL: http://svn.apache.org/viewvc?rev=738327&view=rev
Log:
Make tuscany modules as fragments to axis2 and axiom bunldes to work around the
axis2/axiom classloading issues
Modified:
tuscany/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF
tuscany/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF
tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
Modified: tuscany/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF?rev=738327&r1=738326&r2=738327&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF Wed Jan 28
00:53:49 2009
@@ -148,4 +148,5 @@
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/
Modified: tuscany/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF?rev=738327&r1=738326&r2=738327&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF Wed Jan 28
00:53:49 2009
@@ -14,14 +14,19 @@
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/
Modified:
tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java?rev=738327&r1=738326&r2=738327&view=diff
==============================================================================
---
tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
(original)
+++
tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
Wed Jan 28 00:53:49 2009
@@ -74,60 +74,6 @@
private Map<String, Bundle> allBundles = new HashMap<String, Bundle>();
private List<Bundle> installedBundles = new ArrayList<Bundle>();
- /*
- 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 @@
// 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");
