summaryrefslogtreecommitdiffstats
path: root/java/sca/modules/node-launcher-equinox/src/test
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2008-09-07 11:25:41 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2008-09-07 11:25:41 +0000
commit749d5c9a1c6a58fb7ff9078d97afb96039f89b7a (patch)
tree8057292ef3e9d14636a225811090b74f9faab2e8 /java/sca/modules/node-launcher-equinox/src/test
parent252f4d6eecc3cb008a9b8c139bdafdf588ecadc8 (diff)
Moved hooks from extensiblity-equinox to node-launcher-equinox. Fixed logic that installs bundles in node-launcher-equinox, which now just installs bundles normally and installs all non-bundle JARs in a single 'library' bundle which exports all the packages that they contain. The startup sequence is now simpler and significantly faster.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@692820 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/node-launcher-equinox/src/test')
-rw-r--r--java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java4
-rw-r--r--java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java6
2 files changed, 7 insertions, 3 deletions
diff --git a/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java b/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
index 96e276c3b4..da0ab774a3 100644
--- a/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
+++ b/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
@@ -35,7 +35,7 @@ import org.osgi.framework.BundleContext;
public class EquinoxOSGiHostTestCase {
@Test
public void testStartThenStop() {
- EquinoxOSGiHost host = new EquinoxOSGiHost();
+ EquinoxHost host = new EquinoxHost();
BundleContext context = host.start();
Assert.assertNotNull(context);
for (Bundle b : context.getBundles()) {
@@ -46,7 +46,7 @@ public class EquinoxOSGiHostTestCase {
@Test
public void testStartTwice() {
- EquinoxOSGiHost host = new EquinoxOSGiHost();
+ EquinoxHost host = new EquinoxHost();
host.start();
try {
host.start();
diff --git a/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java b/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
index d393637848..569b82cf4c 100644
--- a/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
+++ b/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
@@ -36,7 +36,11 @@ public class NodeLauncherTestCase {
@BeforeClass
public static void setUp() {
- launcher = NodeLauncher.newInstance();
+ try {
+ launcher = NodeLauncher.newInstance();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
@AfterClass