Author: cschneider
Date: Tue Apr 10 20:42:52 2012
New Revision: 1311978
URL: http://svn.apache.org/viewvc?rev=1311978&view=rev
Log:
KARAF-1302 Use aries jmx for diagnostic module
Added:
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/DiagnosticDumpMBean.java
- copied, changed from r1311828,
karaf/trunk/diagnostic/management/src/main/java/org/apache/karaf/diagnostic/management/DiagnosticDumpMBean.java
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/BundleDumpProvider.java
- copied, changed from r1311828,
karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/BundleDumpProvider.java
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/DiagnosticDump.java
- copied, changed from r1311828,
karaf/trunk/diagnostic/management/src/main/java/org/apache/karaf/diagnostic/management/internal/DiagnosticDumpMBeanImpl.java
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/FeaturesDumpProvider.java
- copied, changed from r1311828,
karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/FeaturesDumpProvider.java
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/LogDumpProvider.java
- copied, changed from r1311828,
karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/ThreadDumpProvider.java
- copied, changed from r1311828,
karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/ThreadDumpProvider.java
karaf/trunk/diagnostic/core/src/main/resources/OSGI-INF/blueprint/
- copied from r1311828,
karaf/trunk/diagnostic/management/src/main/resources/OSGI-INF/blueprint/
karaf/trunk/diagnostic/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
- copied, changed from r1311828,
karaf/trunk/diagnostic/management/src/main/resources/OSGI-INF/blueprint/diagnostic-management.xml
Removed:
karaf/trunk/diagnostic/common/
karaf/trunk/diagnostic/core/src/main/resources/OSGI-INF/blueprint/diagnostic-management.xml
karaf/trunk/diagnostic/management/
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/diagnostic/core/pom.xml
karaf/trunk/diagnostic/pom.xml
karaf/trunk/pom.xml
Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1311978&r1=1311977&r2=1311978&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
(original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Tue
Apr 10 20:42:52 2012
@@ -30,9 +30,7 @@
<bundle
start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.config/${project.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.command/${project.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.core/${project.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.common/${project.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.command/${project.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.management/${project.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.log/org.apache.karaf.log.core/${project.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.log/org.apache.karaf.log.command/${project.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.service/org.apache.karaf.service.core/${project.version}</bundle>
Modified: karaf/trunk/diagnostic/core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/diagnostic/core/pom.xml?rev=1311978&r1=1311977&r2=1311978&view=diff
==============================================================================
--- karaf/trunk/diagnostic/core/pom.xml (original)
+++ karaf/trunk/diagnostic/core/pom.xml Tue Apr 10 20:42:52 2012
@@ -37,6 +37,25 @@
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.core</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<resources>
<resource>
@@ -60,15 +79,11 @@
<configuration>
<instructions>
<Export-Package>
-
${project.artifactId};version=${project.version},
-
${project.artifactId}.common;version=${project.version};-noimport:=true,
+ ${project.artifactId},
+ ${project.artifactId}.common
</Export-Package>
- <Import-Package>
- !${project.artifactId}*,
- *
- </Import-Package>
<Private-Package>
- org.apache.karaf.diagnostic.internal
+ org.apache.karaf.diagnostic.core.internal
</Private-Package>
</instructions>
</configuration>
Copied:
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/DiagnosticDumpMBean.java
(from r1311828,
karaf/trunk/diagnostic/management/src/main/java/org/apache/karaf/diagnostic/management/DiagnosticDumpMBean.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/DiagnosticDumpMBean.java?p2=karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/DiagnosticDumpMBean.java&p1=karaf/trunk/diagnostic/management/src/main/java/org/apache/karaf/diagnostic/management/DiagnosticDumpMBean.java&r1=1311828&r2=1311978&rev=1311978&view=diff
==============================================================================
---
karaf/trunk/diagnostic/management/src/main/java/org/apache/karaf/diagnostic/management/DiagnosticDumpMBean.java
(original)
+++
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/DiagnosticDumpMBean.java
Tue Apr 10 20:42:52 2012
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.diagnostic.management;
+package org.apache.karaf.diagnostic.core;
/**
* Diagnostic MBean which allows to create dumps over JMX.
Copied:
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/BundleDumpProvider.java
(from r1311828,
karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/BundleDumpProvider.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/BundleDumpProvider.java?p2=karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/BundleDumpProvider.java&p1=karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/BundleDumpProvider.java&r1=1311828&r2=1311978&rev=1311978&view=diff
==============================================================================
---
karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/BundleDumpProvider.java
(original)
+++
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/BundleDumpProvider.java
Tue Apr 10 20:42:52 2012
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.diagnostic.common;
+package org.apache.karaf.diagnostic.core.internal;
import java.io.IOException;
import java.io.OutputStreamWriter;
Copied:
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/DiagnosticDump.java
(from r1311828,
karaf/trunk/diagnostic/management/src/main/java/org/apache/karaf/diagnostic/management/internal/DiagnosticDumpMBeanImpl.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/DiagnosticDump.java?p2=karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/DiagnosticDump.java&p1=karaf/trunk/diagnostic/management/src/main/java/org/apache/karaf/diagnostic/management/internal/DiagnosticDumpMBeanImpl.java&r1=1311828&r2=1311978&rev=1311978&view=diff
==============================================================================
---
karaf/trunk/diagnostic/management/src/main/java/org/apache/karaf/diagnostic/management/internal/DiagnosticDumpMBeanImpl.java
(original)
+++
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/DiagnosticDump.java
Tue Apr 10 20:42:52 2012
@@ -11,7 +11,7 @@
* License for the specific language governing permissions and limitations
under
* the License.
*/
-package org.apache.karaf.diagnostic.management.internal;
+package org.apache.karaf.diagnostic.core.internal;
import java.io.File;
import java.util.List;
@@ -19,16 +19,16 @@ import java.util.List;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
+import org.apache.karaf.diagnostic.core.DiagnosticDumpMBean;
import org.apache.karaf.diagnostic.core.DumpDestination;
import org.apache.karaf.diagnostic.core.DumpProvider;
import org.apache.karaf.diagnostic.core.common.DirectoryDumpDestination;
import org.apache.karaf.diagnostic.core.common.ZipDumpDestination;
-import org.apache.karaf.diagnostic.management.DiagnosticDumpMBean;
/**
* Implementation of diagnostic MBean.
*/
-public class DiagnosticDumpMBeanImpl extends StandardMBean implements
+public class DiagnosticDump extends StandardMBean implements
DiagnosticDumpMBean {
/**
@@ -41,7 +41,7 @@ public class DiagnosticDumpMBeanImpl ext
*
* @throws NotCompliantMBeanException
*/
- public DiagnosticDumpMBeanImpl() throws NotCompliantMBeanException {
+ public DiagnosticDump() throws NotCompliantMBeanException {
super(DiagnosticDumpMBean.class);
}
Copied:
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/FeaturesDumpProvider.java
(from r1311828,
karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/FeaturesDumpProvider.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/FeaturesDumpProvider.java?p2=karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/FeaturesDumpProvider.java&p1=karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/FeaturesDumpProvider.java&r1=1311828&r2=1311978&rev=1311978&view=diff
==============================================================================
---
karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/FeaturesDumpProvider.java
(original)
+++
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/FeaturesDumpProvider.java
Tue Apr 10 20:42:52 2012
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.diagnostic.common;
+package org.apache.karaf.diagnostic.core.internal;
import java.io.OutputStreamWriter;
Copied:
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/LogDumpProvider.java
(from r1311828,
karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/LogDumpProvider.java?p2=karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/LogDumpProvider.java&p1=karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java&r1=1311828&r2=1311978&rev=1311978&view=diff
==============================================================================
---
karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java
(original)
+++
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/LogDumpProvider.java
Tue Apr 10 20:42:52 2012
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.diagnostic.common;
+package org.apache.karaf.diagnostic.core.internal;
import java.io.File;
import java.io.FileInputStream;
Copied:
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/ThreadDumpProvider.java
(from r1311828,
karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/ThreadDumpProvider.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/ThreadDumpProvider.java?p2=karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/ThreadDumpProvider.java&p1=karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/ThreadDumpProvider.java&r1=1311828&r2=1311978&rev=1311978&view=diff
==============================================================================
---
karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/ThreadDumpProvider.java
(original)
+++
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/ThreadDumpProvider.java
Tue Apr 10 20:42:52 2012
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.diagnostic.common;
+package org.apache.karaf.diagnostic.core.internal;
import java.io.OutputStreamWriter;
import java.lang.management.ManagementFactory;
Copied:
karaf/trunk/diagnostic/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
(from r1311828,
karaf/trunk/diagnostic/management/src/main/resources/OSGI-INF/blueprint/diagnostic-management.xml)
URL:
http://svn.apache.org/viewvc/karaf/trunk/diagnostic/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?p2=karaf/trunk/diagnostic/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml&p1=karaf/trunk/diagnostic/management/src/main/resources/OSGI-INF/blueprint/diagnostic-management.xml&r1=1311828&r2=1311978&rev=1311978&view=diff
==============================================================================
---
karaf/trunk/diagnostic/management/src/main/resources/OSGI-INF/blueprint/diagnostic-management.xml
(original)
+++
karaf/trunk/diagnostic/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Tue Apr 10 20:42:52 2012
@@ -17,26 +17,43 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";
default-activation="eager">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0";
+ xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0";>
+
+ <ext:property-placeholder />
+
+ <bean id="features"
class="org.apache.karaf.diagnostic.core.internal.FeaturesDumpProvider">
+ <argument>
+ <reference interface="org.apache.karaf.features.FeaturesService"
+ availability="optional" />
+ </argument>
+ </bean>
+ <service ref="features" auto-export="interfaces" />
+
+ <bean id="logs"
class="org.apache.karaf.diagnostic.core.internal.LogDumpProvider">
+ <property name="bundleContext" ref="blueprintBundleContext"/>
+ </bean>
+ <service ref="logs" auto-export="interfaces" />
+
+ <bean id="bundles"
class="org.apache.karaf.diagnostic.core.internal.BundleDumpProvider">
+ <argument ref="blueprintBundleContext" />
+ </bean>
+ <service ref="bundles" auto-export="interfaces" />
+
+ <bean id="threads"
class="org.apache.karaf.diagnostic.core.internal.ThreadDumpProvider" />
+ <service ref="threads" auto-export="interfaces" />
<reference-list id="providers" availability="optional"
interface="org.apache.karaf.diagnostic.core.DumpProvider" />
- <reference id="mbeanServer" interface="javax.management.MBeanServer">
- <reference-listener ref="mbeanRegister"
bind-method="registerMBeanServer" unbind-method="unregisterMBeanServer" />
- </reference>
-
- <bean id="mbeanImpl"
class="org.apache.karaf.diagnostic.management.internal.DiagnosticDumpMBeanImpl">
+ <bean id="diagnosticDumpMBean"
class="org.apache.karaf.diagnostic.core.internal.DiagnosticDump">
<property name="providers" ref="providers" />
</bean>
- <bean id="mbeanRegister"
class="org.apache.karaf.management.MBeanRegistrer">
- <property name="mbeans">
- <map>
- <entry
value="org.apache.karaf:type=diagnostic,name=${karaf.name}"
- key-ref="mbeanImpl" />
- </map>
- </property>
- </bean>
-
+ <service ref="diagnosticDumpMBean" auto-export="interfaces">
+ <service-properties>
+ <entry key="jmx.objectname"
value="org.apache.karaf:type=diagnostic,name=${karaf.name}"/>
+ </service-properties>
+ </service>
</blueprint>
Modified: karaf/trunk/diagnostic/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/diagnostic/pom.xml?rev=1311978&r1=1311977&r2=1311978&view=diff
==============================================================================
--- karaf/trunk/diagnostic/pom.xml (original)
+++ karaf/trunk/diagnostic/pom.xml Tue Apr 10 20:42:52 2012
@@ -36,8 +36,6 @@
<modules>
<module>core</module>
<module>command</module>
- <module>management</module>
- <module>common</module>
</modules>
</project>
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1311978&r1=1311977&r2=1311978&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Apr 10 20:42:52 2012
@@ -496,19 +496,9 @@
</dependency>
<dependency>
<groupId>org.apache.karaf.diagnostic</groupId>
- <artifactId>org.apache.karaf.diagnostic.common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.diagnostic</groupId>
<artifactId>org.apache.karaf.diagnostic.command</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.karaf.diagnostic</groupId>
- <artifactId>org.apache.karaf.diagnostic.management</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.karaf.instance</groupId>
