You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/09/07 20:04:42 UTC
svn commit: r692913 - in /tuscany/java/sca/modules: extensibility-equinox/
extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/
node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/
Author: jsdelfino
Date: Sun Sep 7 11:04:41 2008
New Revision: 692913
URL: http://svn.apache.org/viewvc?rev=692913&view=rev
Log:
Added an dynamicimport declaration to extensibility-equinox. Forced activation of all bundles for now to help diagnose any errors. Added a call to set the the current thread context classloader to the extensiblity-equinox bundle's classloader.
Modified:
tuscany/java/sca/modules/extensibility-equinox/pom.xml
tuscany/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherBundleActivator.java
Modified: tuscany/java/sca/modules/extensibility-equinox/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/extensibility-equinox/pom.xml?rev=692913&r1=692912&r2=692913&view=diff
==============================================================================
--- tuscany/java/sca/modules/extensibility-equinox/pom.xml (original)
+++ tuscany/java/sca/modules/extensibility-equinox/pom.xml Sun Sep 7 11:04:41 2008
@@ -79,6 +79,7 @@
<Bundle-Activator>org.apache.tuscany.sca.extensibility.equinox.EquinoxServiceDiscoveryActivator</Bundle-Activator>
<Export-Package>org.apache.tuscany.sca.extensibility.equinox*</Export-Package>
<Eclipse-AutoStart>true</Eclipse-AutoStart>
+ <DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
</plugin>
Modified: tuscany/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java?rev=692913&r1=692912&r2=692913&view=diff
==============================================================================
--- tuscany/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java (original)
+++ tuscany/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java Sun Sep 7 11:04:41 2008
@@ -19,6 +19,8 @@
package org.apache.tuscany.sca.extensibility.equinox;
+import java.util.logging.Logger;
+
import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -29,10 +31,14 @@
* @version $Rev: $ $Date: $
*/
public class EquinoxServiceDiscoveryActivator implements BundleActivator {
+ private static Logger logger = Logger.getLogger(EquinoxServiceDiscoveryActivator.class.getName());
public void start(BundleContext context) throws Exception {
+ logger.info("Installing service discovery");
EquinoxServiceDiscoverer discoverer = new EquinoxServiceDiscoverer(context);
ServiceDiscovery.getInstance().setServiceDiscoverer(discoverer);
+ logger.info("Installed service discovery");
+ Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
}
public void stop(BundleContext context) throws Exception {
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=692913&r1=692912&r2=692913&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 Sun Sep 7 11:04:41 2008
@@ -151,12 +151,14 @@
launcherBundle.start();
// Start all bundles for now to help diagnose any class loading issues
- //for (Bundle bundle: context.getBundles()) {
- // if ((bundle.getState() & Bundle.ACTIVE) == 0) {
- // logger.info("Starting bundle: " + string(bundle, false));
- // bundle.start();
- // }
- //}
+ long activateStart = System.currentTimeMillis();
+ for (Bundle bundle: context.getBundles()) {
+ if ((bundle.getState() & Bundle.ACTIVE) == 0) {
+ logger.info("Starting bundle: " + string(bundle, false));
+ bundle.start();
+ }
+ }
+ logger.info("Tuscany bundles are started in " + (System.currentTimeMillis() - activateStart) + " ms.");
return context;
Modified: tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherBundleActivator.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherBundleActivator.java?rev=692913&r1=692912&r2=692913&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherBundleActivator.java (original)
+++ tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherBundleActivator.java Sun Sep 7 11:04:41 2008
@@ -72,7 +72,7 @@
}
long installStart = System.currentTimeMillis();
Bundle bundle = bundleContext.installBundle(bundleFile);
- //logger.info("Bundle installed in " + (System.currentTimeMillis() - installStart) + " ms: " + NodeLauncherUtil.string(bundle, false));
+ logger.info("Bundle installed in " + (System.currentTimeMillis() - installStart) + " ms: " + NodeLauncherUtil.string(bundle, false));
installedBundles.add(bundle);
}
}