You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/04/11 12:53:11 UTC
svn commit: r1324693 - in /karaf/trunk:
assemblies/features/standard/src/main/feature/ system/ system/commands/
system/core/ system/core/src/main/java/org/apache/karaf/system/management/
system/core/src/main/java/org/apache/karaf/system/management/inte...
Author: cschneider
Date: Wed Apr 11 10:53:10 2012
New Revision: 1324693
URL: http://svn.apache.org/viewvc?rev=1324693&view=rev
Log:
KARAF-1302 Use aries jmx for system module
Added:
karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/
karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/SystemMBean.java
- copied unchanged from r1324616, karaf/trunk/system/management/src/main/java/org/apache/karaf/system/management/SystemMBean.java
karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/internal/
- copied from r1324616, karaf/trunk/system/management/src/main/java/org/apache/karaf/system/management/internal/
karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/internal/System.java
- copied, changed from r1324616, karaf/trunk/system/management/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java
Removed:
karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java
karaf/trunk/system/management/
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/system/commands/pom.xml
karaf/trunk/system/core/pom.xml
karaf/trunk/system/core/src/main/resources/OSGI-INF/blueprint/system-core.xml
karaf/trunk/system/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=1324693&r1=1324692&r2=1324693&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Wed Apr 11 10:53:10 2012
@@ -173,7 +173,6 @@
<feature name="management" description="Provide a JMX MBeanServer and a set of MBeans in Karaf" version="${project.version}">
<bundle start-level="30">mvn:org.apache.karaf.management/org.apache.karaf.management.server/${project.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.system/org.apache.karaf.system.management/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.api/${aries.jmx.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/${aries.jmx.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}</bundle>
Modified: karaf/trunk/system/commands/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/system/commands/pom.xml?rev=1324693&r1=1324692&r2=1324693&view=diff
==============================================================================
--- karaf/trunk/system/commands/pom.xml (original)
+++ karaf/trunk/system/commands/pom.xml Wed Apr 11 10:53:10 2012
@@ -48,6 +48,10 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: karaf/trunk/system/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/system/core/pom.xml?rev=1324693&r1=1324692&r2=1324693&view=diff
==============================================================================
--- karaf/trunk/system/core/pom.xml (original)
+++ karaf/trunk/system/core/pom.xml Wed Apr 11 10:53:10 2012
@@ -75,14 +75,12 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.karaf.system;version=${project.version}
+ org.apache.karaf.system,
+ org.apache.karaf.system.management
</Export-Package>
- <Import-Package>
- !org.apache.karaf.system*,
- *
- </Import-Package>
<Private-Package>
- org.apache.karaf.system.internal
+ org.apache.karaf.system.internal,
+ org.apache.karaf.system.management.internal
</Private-Package>
</instructions>
</configuration>
Copied: karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/internal/System.java (from r1324616, karaf/trunk/system/management/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/internal/System.java?p2=karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/internal/System.java&p1=karaf/trunk/system/management/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java&r1=1324616&r2=1324693&rev=1324693&view=diff
==============================================================================
--- karaf/trunk/system/management/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java (original)
+++ karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/internal/System.java Wed Apr 11 10:53:10 2012
@@ -25,11 +25,11 @@ import javax.management.StandardMBean;
/**
* System MBean implementation.
*/
-public class SystemMBeanImpl extends StandardMBean implements SystemMBean {
+public class System extends StandardMBean implements SystemMBean {
private SystemService systemService;
- public SystemMBeanImpl() throws NotCompliantMBeanException {
+ public System() throws NotCompliantMBeanException {
super(SystemMBean.class);
}
Modified: karaf/trunk/system/core/src/main/resources/OSGI-INF/blueprint/system-core.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/system/core/src/main/resources/OSGI-INF/blueprint/system-core.xml?rev=1324693&r1=1324692&r2=1324693&view=diff
==============================================================================
--- karaf/trunk/system/core/src/main/resources/OSGI-INF/blueprint/system-core.xml (original)
+++ karaf/trunk/system/core/src/main/resources/OSGI-INF/blueprint/system-core.xml Wed Apr 11 10:53:10 2012
@@ -17,7 +17,11 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
+<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="systemService" class="org.apache.karaf.system.internal.SystemServiceImpl">
<property name="bundleContext" ref="blueprintBundleContext"/>
@@ -25,4 +29,13 @@
<service ref="systemService" interface="org.apache.karaf.system.SystemService"/>
+ <bean id="systemMBean" class="org.apache.karaf.system.management.internal.System">
+ <property name="systemService" ref="systemService" />
+ </bean>
+
+ <service ref="systemMBean" interface="org.apache.karaf.system.management.SystemMBean">
+ <service-properties>
+ <entry key="jmx.objectname" value="org.apache.karaf:type=system,name=${karaf.name}"/>
+ </service-properties>
+ </service>
</blueprint>
\ No newline at end of file
Modified: karaf/trunk/system/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/system/pom.xml?rev=1324693&r1=1324692&r2=1324693&view=diff
==============================================================================
--- karaf/trunk/system/pom.xml (original)
+++ karaf/trunk/system/pom.xml Wed Apr 11 10:53:10 2012
@@ -36,7 +36,6 @@
<modules>
<module>core</module>
<module>commands</module>
- <module>management</module>
</modules>
</project>
\ No newline at end of file