[KARAF-3739] Add eventadmin feature as featuresBoot
diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml
index 6d3aad5..aa389ec 100644
--- a/assemblies/apache-karaf/pom.xml
+++ b/assemblies/apache-karaf/pom.xml
@@ -160,6 +160,7 @@
<feature>wrapper</feature>
</installedFeatures>
<bootFeatures>
+ <feature>eventadmin</feature>
<feature>wrap</feature>
<feature>aries-blueprint</feature>
<feature>shell</feature>
diff --git a/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java
index 1d353bd..f64dc02 100644
--- a/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java
@@ -82,18 +82,9 @@
assertBundleInstalled("org.apache.karaf.webconsole.instance");
assertBundleInstalled("org.apache.karaf.webconsole.gogo");
assertBundleInstalled("org.apache.karaf.webconsole.http");
-
- assertBundleNotInstalled("org.apache.felix.webconsole.plugins.event");
-
- //Add eventadmin
- try {
- featureService.installFeature("eventadmin", EnumSet.of(FeaturesService.Option.NoAutoRefreshBundles));
- } catch (Exception ex) {
- //ignore as the eventadmin activator might throw an error.
- }
assertBundleInstalled("org.apache.felix.webconsole.plugins.event");
- //Remove eventadmin
+ // remove eventadmin
featureService.uninstallFeature("eventadmin", EnumSet.of(FeaturesService.Option.NoAutoRefreshBundles));
assertBundleNotInstalled("org.apache.felix.webconsole.plugins.event");
}
diff --git a/itests/src/test/java/org/apache/karaf/itests/FeatureSshCommandSecurityTest.java b/itests/src/test/java/org/apache/karaf/itests/FeatureSshCommandSecurityTest.java
index 223c9a2..110a890 100644
--- a/itests/src/test/java/org/apache/karaf/itests/FeatureSshCommandSecurityTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/FeatureSshCommandSecurityTest.java
@@ -32,22 +32,22 @@
Assert.assertFalse("Precondition failed, this test uses the " + feature + " subsystem to test features with...",
r.contains(feature));
- assertCommand(vieweruser, "feature:install " + feature, Result.NOT_FOUND);
+ assertCommand(vieweruser, "feature:install -r " + feature, Result.NOT_FOUND);
String r2 = assertCommand("karaf", "feature:list -i --no-format", Result.OK);
Assert.assertFalse(feature + " features should not have been installed, as viewer doesn't have credentials",
r2.contains(feature));
- assertCommand("karaf", "feature:install " + feature, Result.OK);
+ assertCommand("karaf", "feature:install -r " + feature, Result.OK);
String r3 = assertCommand(vieweruser, "feature:list -i --no-format", Result.OK);
Assert.assertTrue(feature + " feature should have been installed by 'karaf' user",
r3.contains(feature));
- assertCommand(vieweruser, "feature:uninstall " + feature, Result.NOT_FOUND);
+ assertCommand(vieweruser, "feature:uninstall -r " + feature, Result.NOT_FOUND);
String r4 = assertCommand("karaf", "feature:list -i --no-format", Result.OK);
Assert.assertTrue(feature + " feature should still be there, as viewer doesn't have credentials",
r4.contains(feature));
- assertCommand("karaf", "feature:uninstall " + feature, Result.OK);
+ assertCommand("karaf", "feature:uninstall -r " + feature, Result.OK);
String r5 = assertCommand(vieweruser, "feature:list -i --no-format", Result.OK);
Assert.assertFalse(feature + " feature should have been uninstalled",
r5.contains(feature));
diff --git a/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java b/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java
index 5e9c13e..9aa4112 100644
--- a/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java
@@ -34,7 +34,7 @@
@Test
public void bootFeatures() throws Exception {
- assertFeaturesInstalled("jaas", "ssh", "management", "bundle", "config", "deployer", "diagnostic",
+ assertFeaturesInstalled("eventadmin","jaas", "ssh", "management", "bundle", "config", "deployer", "diagnostic",
"instance", "kar", "log", "package", "service", "system");
}
@@ -64,9 +64,9 @@
@Test
public void installUninstallCommand() throws Exception {
- System.out.println(executeCommand("feature:install -v wrapper", new RolePrincipal("admin")));
+ System.out.println(executeCommand("feature:install -v -r wrapper", new RolePrincipal("admin")));
assertFeatureInstalled("wrapper");
- System.out.println(executeCommand("feature:uninstall wrapper", new RolePrincipal("admin")));
+ System.out.println(executeCommand("feature:uninstall -r wrapper", new RolePrincipal("admin")));
assertFeatureNotInstalled("wrapper");
}
@@ -77,9 +77,9 @@
connector = this.getJMXConnector();
MBeanServerConnection connection = connector.getMBeanServerConnection();
ObjectName name = new ObjectName("org.apache.karaf:type=feature,name=root");
- connection.invoke(name, "installFeature", new Object[] { "wrapper" }, new String[]{ "java.lang.String" });
+ connection.invoke(name, "installFeature", new Object[] { "wrapper", true }, new String[]{ "java.lang.String", "boolean" });
assertFeatureInstalled("wrapper");
- connection.invoke(name, "uninstallFeature", new Object[] { "wrapper" }, new String[]{ "java.lang.String" });
+ connection.invoke(name, "uninstallFeature", new Object[] { "wrapper", true }, new String[]{ "java.lang.String", "boolean" });
assertFeatureNotInstalled("wrapper");
} finally {
close(connector);
