Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2009-08-11 20:46:27 +0000
committerThomas Watson2009-08-11 20:46:27 +0000
commit66f9ff0d8eea97dec3c46771bfd05ea872f74d67 (patch)
tree336e5d93d13e332296105eb5dedae03887611ed9 /bundles/org.eclipse.osgi.tests
parenteba7d057fb6acef285e31c5f5652b902a949d3d5 (diff)
downloadrt.equinox.framework-66f9ff0d8eea97dec3c46771bfd05ea872f74d67.tar.gz
rt.equinox.framework-66f9ff0d8eea97dec3c46771bfd05ea872f74d67.tar.xz
rt.equinox.framework-66f9ff0d8eea97dec3c46771bfd05ea872f74d67.zip
Bug 286307 FilePermission with "<<ALL FILES>>" in permissions.perm
Diffstat (limited to 'bundles/org.eclipse.osgi.tests')
-rw-r--r--bundles/org.eclipse.osgi.tests/.classpath1
-rw-r--r--bundles/org.eclipse.osgi.tests/build.properties5
-rw-r--r--bundles/org.eclipse.osgi.tests/bundles_src/test.bug286307/META-INF/MANIFEST.MF5
-rw-r--r--bundles/org.eclipse.osgi.tests/bundles_src/test.bug286307/OSGI-INF/permissions.perm1
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityAdminUnitTests.java122
5 files changed, 72 insertions, 62 deletions
diff --git a/bundles/org.eclipse.osgi.tests/.classpath b/bundles/org.eclipse.osgi.tests/.classpath
index eac8cbc7f..6b0f195c3 100644
--- a/bundles/org.eclipse.osgi.tests/.classpath
+++ b/bundles/org.eclipse.osgi.tests/.classpath
@@ -102,6 +102,7 @@
<classpathentry kind="src" output="bundle_tests/test.bug259903.c" path="bundles_src/test.bug259903.c"/>
<classpathentry kind="src" output="bundle_tests/test.tccl" path="bundles_src/test.tccl"/>
<classpathentry kind="src" output="bundle_tests/test.manifestpackage" path="bundles_src/test.manifestpackage"/>
+ <classpathentry kind="src" output="bundle_tests/test.bug286307" path="bundles_src/test.bug286307"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.osgi.tests/build.properties b/bundles/org.eclipse.osgi.tests/build.properties
index 7cba3938f..8eef292de 100644
--- a/bundles/org.eclipse.osgi.tests/build.properties
+++ b/bundles/org.eclipse.osgi.tests/build.properties
@@ -219,6 +219,8 @@ source.bundle_tests/test.tccl.jar = bundles_src/test.tccl/
manifest.bundle_tests/test.tccl.jar = META-INF/MANIFEST.MF
source.bundle_tests/test.manifestpackage.jar = bundles_src/test.manifestpackage/
manifest.bundle_tests/test.manifestpackage.jar = META-INF/MANIFEST.MF
+source.bundle_tests/test.bug286307.jar = bundles_src/test.bug286307/
+manifest.bundle_tests/test.bug286307.jar = META-INF/MANIFEST.MF
jars.compile.order = bundle_tests/ext.framework.b.jar,\
osgitests.jar,\
@@ -321,4 +323,5 @@ jars.compile.order = bundle_tests/ext.framework.b.jar,\
bundle_tests/test.bug259903.b.jar,\
bundle_tests/test.bug259903.c.jar,\
bundle_tests/test.tccl.jar,\
- bundle_tests/test.manifestpackage.jar
+ bundle_tests/test.manifestpackage.jar,\
+ bundle_tests/test.bug286307.jar
diff --git a/bundles/org.eclipse.osgi.tests/bundles_src/test.bug286307/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.tests/bundles_src/test.bug286307/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..bcc28e246
--- /dev/null
+++ b/bundles/org.eclipse.osgi.tests/bundles_src/test.bug286307/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: test.bug286307
+Bundle-SymbolicName: test.bug286307
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.osgi.tests/bundles_src/test.bug286307/OSGI-INF/permissions.perm b/bundles/org.eclipse.osgi.tests/bundles_src/test.bug286307/OSGI-INF/permissions.perm
new file mode 100644
index 000000000..7490ecabf
--- /dev/null
+++ b/bundles/org.eclipse.osgi.tests/bundles_src/test.bug286307/OSGI-INF/permissions.perm
@@ -0,0 +1 @@
+(java.io.FilePermission "<<ALL FILES>>" "read")
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityAdminUnitTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityAdminUnitTests.java
index a446eb488..03d1c8b27 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityAdminUnitTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityAdminUnitTests.java
@@ -18,7 +18,6 @@ import java.security.*;
import java.util.*;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.osgi.framework.internal.core.AbstractBundle;
import org.eclipse.osgi.internal.permadmin.EquinoxSecurityManager;
import org.eclipse.osgi.internal.permadmin.SecurityAdmin;
import org.eclipse.osgi.tests.bundles.AbstractBundleTests;
@@ -46,6 +45,8 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
private static final ConditionInfo SIGNER_CONDITION1 = new ConditionInfo("org.osgi.service.condpermadmin.BundleSignerCondition", new String[] {"*;cn=test1,c=US"}); //$NON-NLS-1$//$NON-NLS-2$
private static final ConditionInfo SIGNER_CONDITION2 = new ConditionInfo("org.osgi.service.condpermadmin.BundleSignerCondition", new String[] {"*;cn=test2,c=US"}); //$NON-NLS-1$//$NON-NLS-2$
private static final ConditionInfo NOT_SIGNER_CONDITION1 = new ConditionInfo("org.osgi.service.condpermadmin.BundleSignerCondition", new String[] {"*;cn=test1,c=US", "!"}); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ private static final String TEST_BUNDLE = "test"; //$NON-NLS-1$
+ private static final String TEST2_BUNDLE = "test2"; //$NON-NLS-1$
//private static final ConditionInfo POST_MUT_NOTSAT = new ConditionInfo("ext.framework.b.TestCondition", new String[] {"POST_MUT_NOTSAT", "true", "true", "false"}); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
//private static final ConditionInfo POST_NOTMUT_SAT = new ConditionInfo("ext.framework.b.TestCondition", new String[] {"POST_NOTMUT_SAT", "true", "false", "true"}); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
@@ -74,16 +75,16 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
public void testCreateDomain() {
SecurityAdmin securityAdmin = createSecurityAdmin(null);
- Bundle test = installTestBundle();
- ProtectionDomain pd = securityAdmin.createProtectionDomain((AbstractBundle) test);
+ Bundle test = installTestBundle(TEST_BUNDLE);
+ ProtectionDomain pd = securityAdmin.createProtectionDomain(test);
if (!pd.implies(new AllPermission()))
fail("test bundle should have AllPermission"); //$NON-NLS-1$
}
public void testLocationPermission01() {
SecurityAdmin securityAdmin = createSecurityAdmin(null);
- Bundle test = installTestBundle();
- ProtectionDomain pd = securityAdmin.createProtectionDomain((AbstractBundle) test);
+ Bundle test = installTestBundle(TEST_BUNDLE);
+ ProtectionDomain pd = securityAdmin.createProtectionDomain(test);
securityAdmin.setPermissions(test.getLocation(), READONLY_INFOS);
testPermission(pd, new FilePermission("test", "write"), false); //$NON-NLS-1$ //$NON-NLS-2$
@@ -99,8 +100,8 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
public void testLocationPermission02() {
SecurityAdmin securityAdmin = createSecurityAdmin(null);
- Bundle test = installTestBundle();
- ProtectionDomain pd = securityAdmin.createProtectionDomain((AbstractBundle) test);
+ Bundle test = installTestBundle(TEST_BUNDLE);
+ ProtectionDomain pd = securityAdmin.createProtectionDomain(test);
securityAdmin.setPermissions(test.getLocation(), READWRITE_INFOS);
testPermission(pd, new FilePermission("test", "write"), true); //$NON-NLS-1$ //$NON-NLS-2$
@@ -116,8 +117,8 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
public void testLocationPermission03() {
SecurityAdmin securityAdmin = createSecurityAdmin(null);
- Bundle test = installTestBundle();
- ProtectionDomain pd = securityAdmin.createProtectionDomain((AbstractBundle) test);
+ Bundle test = installTestBundle(TEST_BUNDLE);
+ ProtectionDomain pd = securityAdmin.createProtectionDomain(test);
securityAdmin.setDefaultPermissions(READONLY_INFOS);
securityAdmin.setPermissions(test.getLocation(), READWRITE_INFOS);
@@ -151,8 +152,8 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
public void testDefaultPermissions01() {
SecurityAdmin securityAdmin = createSecurityAdmin(null);
- Bundle test = installTestBundle();
- ProtectionDomain pd = securityAdmin.createProtectionDomain((AbstractBundle) test);
+ Bundle test = installTestBundle(TEST_BUNDLE);
+ ProtectionDomain pd = securityAdmin.createProtectionDomain(test);
securityAdmin.setDefaultPermissions(READONLY_INFOS);
testPermission(pd, new FilePermission("test", "write"), false); //$NON-NLS-1$ //$NON-NLS-2$
testPermission(pd, new FilePermission("test", "read"), true); //$NON-NLS-1$ //$NON-NLS-2$
@@ -167,8 +168,8 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
public void testDefaultPermissions02() {
SecurityAdmin securityAdmin = createSecurityAdmin(null);
- Bundle test = installTestBundle();
- ProtectionDomain pd = securityAdmin.createProtectionDomain((AbstractBundle) test);
+ Bundle test = installTestBundle(TEST_BUNDLE);
+ ProtectionDomain pd = securityAdmin.createProtectionDomain(test);
securityAdmin.setDefaultPermissions(READONLY_INFOS);
securityAdmin.setPermissions(test.getLocation(), SOCKET_INFOS);
@@ -194,8 +195,8 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
public void testNotLocationCondition01() {
SecurityAdmin securityAdmin = createSecurityAdmin(null);
- Bundle test = installTestBundle();
- ProtectionDomain pd = securityAdmin.createProtectionDomain((AbstractBundle) test);
+ Bundle test = installTestBundle(TEST_BUNDLE);
+ ProtectionDomain pd = securityAdmin.createProtectionDomain(test);
ConditionalPermissionInfo condPermInfo = securityAdmin.addConditionalPermissionInfo(getLocationConditions("xxx", true), SOCKET_INFOS); //$NON-NLS-1$
testPermission(pd, new AllPermission(), false);
@@ -208,8 +209,8 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
public void testNotLocationCondition02() {
SecurityAdmin securityAdmin = createSecurityAdmin(null);
- Bundle test = installTestBundle();
- ProtectionDomain pd = securityAdmin.createProtectionDomain((AbstractBundle) test);
+ Bundle test = installTestBundle(TEST_BUNDLE);
+ ProtectionDomain pd = securityAdmin.createProtectionDomain(test);
ConditionalPermissionInfo condPermInfo = securityAdmin.addConditionalPermissionInfo(getLocationConditions(test.getLocation(), true), SOCKET_INFOS);
testPermission(pd, new AllPermission(), false);
@@ -222,8 +223,8 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
public void testMultipleLocationConditions01() {
SecurityAdmin securityAdmin = createSecurityAdmin(null);
- Bundle test = installTestBundle();
- ProtectionDomain pd = securityAdmin.createProtectionDomain((AbstractBundle) test);
+ Bundle test = installTestBundle(TEST_BUNDLE);
+ ProtectionDomain pd = securityAdmin.createProtectionDomain(test);
ConditionalPermissionInfo condPermInfo1 = securityAdmin.addConditionalPermissionInfo(getLocationConditions("xxx", false), SOCKET_INFOS); //$NON-NLS-1$
ConditionalPermissionInfo condPermInfo2 = securityAdmin.addConditionalPermissionInfo(ALLLOCATION_CONDS, READONLY_INFOS);
@@ -245,8 +246,8 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
public void testMultipleLocationConditions02() {
SecurityAdmin securityAdmin = createSecurityAdmin(null);
- Bundle test = installTestBundle();
- ProtectionDomain pd = securityAdmin.createProtectionDomain((AbstractBundle) test);
+ Bundle test = installTestBundle(TEST_BUNDLE);
+ ProtectionDomain pd = securityAdmin.createProtectionDomain(test);
ConditionalPermissionInfo condPermInfo1 = securityAdmin.addConditionalPermissionInfo(getLocationConditions("xxx", false), SOCKET_INFOS); //$NON-NLS-1$
ConditionalPermissionInfo condPermInfo2 = securityAdmin.addConditionalPermissionInfo(ALLLOCATION_CONDS, READONLY_INFOS);
@@ -292,8 +293,8 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
rows.add(info);
assertTrue("failed to commit", update.commit()); //$NON-NLS-1$
- Bundle test = installTestBundle();
- ProtectionDomain pd = securityAdmin.createProtectionDomain((AbstractBundle) test);
+ Bundle test = installTestBundle(TEST_BUNDLE);
+ ProtectionDomain pd = securityAdmin.createProtectionDomain(test);
testPermission(pd, new FilePermission("test", "write"), false); //$NON-NLS-1$ //$NON-NLS-2$
testPermission(pd, new FilePermission("test", "read"), true); //$NON-NLS-1$ //$NON-NLS-2$
testPermission(pd, new AllPermission(), false);
@@ -317,8 +318,8 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
rows.add(info2);
assertTrue("failed to commit", update.commit()); //$NON-NLS-1$
- Bundle test = installTestBundle();
- ProtectionDomain pd = securityAdmin.createProtectionDomain((AbstractBundle) test);
+ Bundle test = installTestBundle(TEST_BUNDLE);
+ ProtectionDomain pd = securityAdmin.createProtectionDomain(test);
testPermission(pd, new FilePermission("test", "write"), false); //$NON-NLS-1$ //$NON-NLS-2$
testPermission(pd, new FilePermission("test", "read"), false); //$NON-NLS-1$ //$NON-NLS-2$
testPermission(pd, new AllPermission(), false);
@@ -359,8 +360,8 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
rows2.remove(0);
assertTrue("failed to commit", update2.commit()); //$NON-NLS-1$
- Bundle test = installTestBundle();
- ProtectionDomain pd = securityAdmin.createProtectionDomain((AbstractBundle) test);
+ Bundle test = installTestBundle(TEST_BUNDLE);
+ ProtectionDomain pd = securityAdmin.createProtectionDomain(test);
testPermission(pd, new FilePermission("test", "write"), false); //$NON-NLS-1$ //$NON-NLS-2$
testPermission(pd, new FilePermission("test", "read"), true); //$NON-NLS-1$ //$NON-NLS-2$
testPermission(pd, new AllPermission(), false);
@@ -386,8 +387,8 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
assertTrue("failed to commit", update.commit()); //$NON-NLS-1$
EquinoxSecurityManager sm = new EquinoxSecurityManager();
- Bundle test = installTestBundle();
- ProtectionDomain pd = securityAdmin.createProtectionDomain((AbstractBundle) test);
+ Bundle test = installTestBundle(TEST_BUNDLE);
+ ProtectionDomain pd = securityAdmin.createProtectionDomain(test);
ProtectionDomain[] pds = new ProtectionDomain[] {pd};
testSMPermission(sm, pds, new FilePermission("test", "write"), false); //$NON-NLS-1$ //$NON-NLS-2$
testSMPermission(sm, pds, new FilePermission("test", "read"), true); //$NON-NLS-1$ //$NON-NLS-2$
@@ -407,10 +408,10 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
TestCondition.clearConditions();
EquinoxSecurityManager sm = new EquinoxSecurityManager();
SecurityAdmin securityAdmin = createSecurityAdmin(sm);
- Bundle test1 = installTestBundle();
- Bundle test2 = installTest2Bundle();
- ProtectionDomain pd1 = securityAdmin.createProtectionDomain((AbstractBundle) test1);
- ProtectionDomain pd2 = securityAdmin.createProtectionDomain((AbstractBundle) test2);
+ Bundle test1 = installTestBundle(TEST_BUNDLE);
+ Bundle test2 = installTestBundle(TEST2_BUNDLE);
+ ProtectionDomain pd1 = securityAdmin.createProtectionDomain(test1);
+ ProtectionDomain pd2 = securityAdmin.createProtectionDomain(test2);
ProtectionDomain[] pds = new ProtectionDomain[] {pd1, pd2};
ConditionalPermissionUpdate update = securityAdmin.newConditionalPermissionUpdate();
@@ -462,10 +463,10 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
TestCondition.clearConditions();
EquinoxSecurityManager sm = new EquinoxSecurityManager();
SecurityAdmin securityAdmin = createSecurityAdmin(sm);
- Bundle test1 = installTestBundle();
- Bundle test2 = installTest2Bundle();
- ProtectionDomain pd1 = securityAdmin.createProtectionDomain((AbstractBundle) test1);
- ProtectionDomain pd2 = securityAdmin.createProtectionDomain((AbstractBundle) test2);
+ Bundle test1 = installTestBundle(TEST_BUNDLE);
+ Bundle test2 = installTestBundle(TEST2_BUNDLE);
+ ProtectionDomain pd1 = securityAdmin.createProtectionDomain(test1);
+ ProtectionDomain pd2 = securityAdmin.createProtectionDomain(test2);
ProtectionDomain[] pds = new ProtectionDomain[] {pd1, pd2};
ConditionalPermissionUpdate update = securityAdmin.newConditionalPermissionUpdate();
@@ -501,10 +502,10 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
TestCondition.clearConditions();
EquinoxSecurityManager sm = new EquinoxSecurityManager();
SecurityAdmin securityAdmin = createSecurityAdmin(sm);
- Bundle test1 = installTestBundle();
- Bundle test2 = installTest2Bundle();
- ProtectionDomain pd1 = securityAdmin.createProtectionDomain((AbstractBundle) test1);
- ProtectionDomain pd2 = securityAdmin.createProtectionDomain((AbstractBundle) test2);
+ Bundle test1 = installTestBundle(TEST_BUNDLE);
+ Bundle test2 = installTestBundle(TEST2_BUNDLE);
+ ProtectionDomain pd1 = securityAdmin.createProtectionDomain(test1);
+ ProtectionDomain pd2 = securityAdmin.createProtectionDomain(test2);
ProtectionDomain[] pds = new ProtectionDomain[] {pd1, pd2};
ConditionalPermissionUpdate update = securityAdmin.newConditionalPermissionUpdate();
@@ -539,10 +540,10 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
TestCondition.clearConditions();
EquinoxSecurityManager sm = new EquinoxSecurityManager();
SecurityAdmin securityAdmin = createSecurityAdmin(sm);
- Bundle test1 = installTestBundle();
- Bundle test2 = installTest2Bundle();
- ProtectionDomain pd1 = securityAdmin.createProtectionDomain((AbstractBundle) test1);
- ProtectionDomain pd2 = securityAdmin.createProtectionDomain((AbstractBundle) test2);
+ Bundle test1 = installTestBundle(TEST_BUNDLE);
+ Bundle test2 = installTestBundle(TEST2_BUNDLE);
+ ProtectionDomain pd1 = securityAdmin.createProtectionDomain(test1);
+ ProtectionDomain pd2 = securityAdmin.createProtectionDomain(test2);
ProtectionDomain[] pds = new ProtectionDomain[] {pd1, pd2};
ConditionalPermissionUpdate update = securityAdmin.newConditionalPermissionUpdate();
@@ -577,10 +578,10 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
TestCondition.clearConditions();
EquinoxSecurityManager sm = new EquinoxSecurityManager();
SecurityAdmin securityAdmin = createSecurityAdmin(sm);
- Bundle test1 = installTestBundle();
- Bundle test2 = installTest2Bundle();
- ProtectionDomain pd1 = securityAdmin.createProtectionDomain((AbstractBundle) test1);
- ProtectionDomain pd2 = securityAdmin.createProtectionDomain((AbstractBundle) test2);
+ Bundle test1 = installTestBundle(TEST_BUNDLE);
+ Bundle test2 = installTestBundle(TEST2_BUNDLE);
+ ProtectionDomain pd1 = securityAdmin.createProtectionDomain(test1);
+ ProtectionDomain pd2 = securityAdmin.createProtectionDomain(test2);
ProtectionDomain[] pds = new ProtectionDomain[] {pd1, pd2};
ConditionalPermissionUpdate update = securityAdmin.newConditionalPermissionUpdate();
@@ -939,6 +940,14 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
}
+ public void testBug286307() {
+ SecurityAdmin securityAdmin = createSecurityAdmin(null);
+ Bundle test = installTestBundle("test.bug286307"); //$NON-NLS-1$
+ ProtectionDomain pd = securityAdmin.createProtectionDomain(test);
+ testPermission(pd, new FilePermission("test", "read"), true); //$NON-NLS-1$ //$NON-NLS-2$
+ testPermission(pd, new AllPermission(), false);
+ }
+
private void checkInfos(ConditionalPermissionInfo testInfo1, ConditionalPermissionInfo testInfo2) {
assertTrue("Infos are not equal: " + testInfo1.getEncoded() + " " + testInfo2.getEncoded(), testInfo1.equals(testInfo2)); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("Info hash code is not equal", testInfo1.hashCode(), testInfo2.hashCode()); //$NON-NLS-1$
@@ -984,20 +993,11 @@ public class SecurityAdminUnitTests extends AbstractBundleTests {
return new ConditionInfo[] {new ConditionInfo("org.osgi.service.condpermadmin.BundleLocationCondition", args)}; //$NON-NLS-1$
}
- private Bundle installTestBundle() {
+ private Bundle installTestBundle(String name) {
try {
- return installer.installBundle("test"); //$NON-NLS-1$
+ return installer.installBundle(name);
} catch (BundleException e) {
- fail("failed to install bundle", e); //$NON-NLS-1$
- }
- return null;
- }
-
- private Bundle installTest2Bundle() {
- try {
- return installer.installBundle("test2"); //$NON-NLS-1$
- } catch (BundleException e) {
- fail("failed to install bundle", e); //$NON-NLS-1$
+ fail("failed to install bundle: " + name, e); //$NON-NLS-1$
}
return null;
}

Back to the top