Repository: karaf Updated Branches: refs/heads/karaf-3.0.x c1cdd70a6 -> fb5c29f17
[KARAF-3453] Add jolokia feature Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/fb5c29f1 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/fb5c29f1 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/fb5c29f1 Branch: refs/heads/karaf-3.0.x Commit: fb5c29f173a5d988b4876e48527ef80df304524a Parents: c1cdd70 Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri May 8 07:30:28 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri May 8 07:30:28 2015 +0200 ---------------------------------------------------------------------- assemblies/features/standard/src/main/feature/feature.xml | 10 ++++++++++ .../karaf/itests/features/StandardFeaturesTest.java | 5 +++++ pom.xml | 1 + 3 files changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/fb5c29f1/assemblies/features/standard/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml index fcbcf6b..3363956 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -205,4 +205,14 @@ <bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.webosgi/${aries.blueprint.web.version}</bundle> </feature> + <feature name="jolokia" description="Jolokia monitoring support" version="${jolokia.version}"> + <feature>http</feature> + <config name="org.jolokia.osgi"> + org.jolokia.user=karaf + org.jolokia.realm=karaf + org.jolokia.authMode=jaas + </config> + <bundle>mvn:org.jolokia/jolokia-osgi/${jolokia.version}</bundle> + </feature> + </features> http://git-wip-us.apache.org/repos/asf/karaf/blob/fb5c29f1/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java index 65d2918..68ccc07 100644 --- a/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java @@ -124,4 +124,9 @@ public class StandardFeaturesTest extends KarafTestSupport { installAssertAndUninstallFeature("scr"); } + @Test + public void installJolokiaFeature() throws Exception { + installAssertAndUninstallFeature("jolokia"); + } + } http://git-wip-us.apache.org/repos/asf/karaf/blob/fb5c29f1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e4ae132..0bf891e 100644 --- a/pom.xml +++ b/pom.xml @@ -139,6 +139,7 @@ <commons-pool.version>1.6</commons-pool.version> <dom4j.bundle.version>1.6.1_5</dom4j.bundle.version> <jasypt.bundle.version>1.9.2_1</jasypt.bundle.version> + <jolokia.version>1.3.0</jolokia.version> <serp.bundle.version>1.14.1_1</serp.bundle.version> <servlet.spec.groupId>org.apache.geronimo.specs</servlet.spec.groupId> <servlet.spec.artifactId>geronimo-servlet_3.0_spec</servlet.spec.artifactId>
