You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/01/26 08:22:07 UTC
karaf git commit: Revert "[KARAF-3453] Add jolokia feature and update
documentation" Postpone to Karaf 3.0.4 (waiting the jolokia 1.2.4 release)
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 3ff18ef5c -> a503b1741
Revert "[KARAF-3453] Add jolokia feature and update documentation"
Postpone to Karaf 3.0.4 (waiting the jolokia 1.2.4 release)
This reverts commit 281126c1bc5914075007fe55a52b00478becdfad.
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a503b174
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a503b174
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a503b174
Branch: refs/heads/karaf-3.0.x
Commit: a503b1741f1cf162d0fab18c3016f0c565efbedf
Parents: 3ff18ef
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Jan 26 08:20:53 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Jan 26 08:20:53 2015 +0100
----------------------------------------------------------------------
.../features/standard/src/main/feature/feature.xml | 14 +++-----------
.../karaf/itests/features/StandardFeaturesTest.java | 5 -----
manual/src/main/webapp/users-guide/monitoring.conf | 16 ++++++++++------
pom.xml | 1 -
4 files changed, 13 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/a503b174/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 ad3793e..fcbcf6b 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -60,6 +60,8 @@
<bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.jexl.evaluator/${aries.blueprint.jexl.evaluator.version}</bundle>
</feature>
+ <!-- NB: this file is not the one really used. This file is used by the karaf-maven-plugin to define the start-level of bundles in the generated feature.xml -->
+
<feature name="wrapper" description="Provide OS integration" version="${project.version}">
<bundle start-level="30">mvn:org.apache.karaf.wrapper/org.apache.karaf.wrapper.core/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.wrapper/org.apache.karaf.wrapper.command/${project.version}</bundle>
@@ -110,7 +112,7 @@
<bundle start-level="30">mvn:org.apache.karaf.web/org.apache.karaf.web.core/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.web/org.apache.karaf.web.command/${project.version}</bundle>
</feature>
-
+
<feature name="jetty" version="8.1.15.v20140411" resolver="(obr)">
<feature>pax-jetty</feature>
</feature>
@@ -203,14 +205,4 @@
<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/a503b174/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 117ea21..65d2918 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,9 +124,4 @@ public class StandardFeaturesTest extends KarafTestSupport {
installAssertAndUninstallFeature("scr");
}
- @Test
- public void installJolokiaFeature() throws Exception {
- installAssertAndUninstallFeatures("jolokia");
- }
-
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/a503b174/manual/src/main/webapp/users-guide/monitoring.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/monitoring.conf b/manual/src/main/webapp/users-guide/monitoring.conf
index 5feedbb..d60eebd 100644
--- a/manual/src/main/webapp/users-guide/monitoring.conf
+++ b/manual/src/main/webapp/users-guide/monitoring.conf
@@ -213,10 +213,16 @@ More over, you may want to write your own application/web application. In that c
[Jolokia|http://www.jolokia.org/] can be installed in Apache Karaf as a remote JMX-HTTP bridge.
-Karaf provides a jolokia feature, ready to install:
+First, you have to install the {{http}} feature:
{code}
-karaf@root()> feature:install jolokia
+karaf@root()> feature:install http
+{code}
+
+Now, you can install directly the Jolokia bundle:
+
+{code}
+karaf@root()> bundle:install -s mvn:org.jolokia/jolokia-osgi/1.1.5
{code}
By default, Jolokia is listening on the port {{8181}} (see the [WebContainer (JSP/Servlet)|webcontainer] page for details about the HTTP configuration).
@@ -224,7 +230,7 @@ By default, Jolokia is listening on the port {{8181}} (see the [WebContainer (JS
If you point a browser on [http://localhost:8181/jolokia] you will see a JSON output like:
{code}
-{"timestamp":1421765829,"status":200,"request":{"type":"version"},"value":{"protocol":"7.2","config":{"useRestrictorService":"false","canonicalNaming":"true","includeStackTrace":"true","listenForHttpService":"true","historyMaxEntries":"10","agentId":"192.168.134.10-5922-6eb8d517-osgi","debug":"false","realm":"karaf","serializeException":"false","agentContext":"\/jolokia","agentType":"servlet","policyLocation":"classpath:\/jolokia-access.xml","user":"karaf","debugMaxEntries":"100","authMode":"jaas","mimeType":"text\/plain"},"agent":"1.2.4-SNAPSHOT","info":{"product":"felix","vendor":"Apache","version":"4.4.1"}}}
+{"timestamp":1387552680,"status":200,"request":{"type":"version"},"value":{"protocol":"7.0","agent":"1.1.5","info":{"product":"felix","vendor":"Apache","version":"4.2.1"}}}
{code}
You can manipulate the Apache Karaf JMX layer via HTTP and JSON, via system tools (like {{curl}}, {{jmx4perl}}, monitoring tools (supporting HTTP/JSON), or web applications.
@@ -245,9 +251,7 @@ The format of the request is:
We can send this JSON request using {{curl}} and get the result:
{code}
-curl -u karaf -d "{\"type\":\"read\",\"mbean\":\"java.lang:type=Memory\",\"attribute\":\"HeapMemoryUsage\",\"path\":\"used\"}" http://localhost:8181/jolokia/ && echo ""
-Enter host password for user 'karaf':
-{"timestamp":1421765948,"status":200,"request":{"mbean":"java.lang:type=Memory","path":"used","attribute":"HeapMemoryUsage","type":"read"},"value":69121000}
+curl -d "{\"type\":\"read\",\"mbean\":\"java.lang:type=Memory\",\"attribute\":\"HeapMemoryUsage\",\"path\":\"used\"}" http://localhost:8080/jolokia/ && echo ""
{code}
You can find details on the [Jolokia website|http://www.jolokia.org] and in the [documentation|http://www.jolokia.org/reference/html/].
http://git-wip-us.apache.org/repos/asf/karaf/blob/a503b174/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 75558ea..8e7245f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,6 @@
<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.2.4-SNAPSHOT</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>