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/10 18:47:35 UTC
svn commit: r1311858 - in /karaf/trunk: ./ assemblies/features/standard/src/main/feature/ config/ config/core/src/main/java/org/apache/karaf/config/core/ config/core/src/main/java/org/apache/karaf/config/core/impl/ config/core/src/main/resources/OSGI-I...

Author: cschneider
Date: Tue Apr 10 16:47:34 2012
New Revision: 1311858

URL: http://svn.apache.org/viewvc?rev=1311858&view=rev
Log:
KARAF-1302 Use aries jmx with config module

Added:
    karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/ConfigMBean.java
      - copied, changed from r1311828, karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/ConfigMBean.java
    karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/impl/Config.java
      - copied, changed from r1311828, karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/internal/ConfigMBeanImpl.java
Removed:
    karaf/trunk/config/management/
Modified:
    karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
    karaf/trunk/config/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
    karaf/trunk/config/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=1311858&r1=1311857&r2=1311858&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 16:47:34 2012
@@ -183,7 +183,6 @@
         <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>
         <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.whiteboard/${aries.jmx.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.karaf.config/org.apache.karaf.config.management/${project.version}</bundle>
     </feature>
 
     <feature name="scheduler" description="Provide a scheduler service in Karaf to fire events" version="${project.version}" resolver="(obr)">

Copied: karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/ConfigMBean.java (from r1311828, karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/ConfigMBean.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/ConfigMBean.java?p2=karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/ConfigMBean.java&p1=karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/ConfigMBean.java&r1=1311828&r2=1311858&rev=1311858&view=diff
==============================================================================
--- karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/ConfigMBean.java (original)
+++ karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/ConfigMBean.java Tue Apr 10 16:47:34 2012
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.config.management;
+package org.apache.karaf.config.core;
 
 import java.io.IOException;
 import java.util.List;

Copied: karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/impl/Config.java (from r1311828, karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/internal/ConfigMBeanImpl.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/impl/Config.java?p2=karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/impl/Config.java&p1=karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/internal/ConfigMBeanImpl.java&r1=1311828&r2=1311858&rev=1311858&view=diff
==============================================================================
--- karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/internal/ConfigMBeanImpl.java (original)
+++ karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/impl/Config.java Tue Apr 10 16:47:34 2012
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.config.management.internal;
+package org.apache.karaf.config.core.impl;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -25,18 +25,18 @@ import java.util.Map;
 import javax.management.NotCompliantMBeanException;
 import javax.management.StandardMBean;
 
+import org.apache.karaf.config.core.ConfigMBean;
 import org.apache.karaf.config.core.ConfigRepository;
-import org.apache.karaf.config.management.ConfigMBean;
 import org.osgi.service.cm.Configuration;
 
 /**
  * Implementation of the ConfigMBean.
  */
-public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean {
+public class Config extends StandardMBean implements ConfigMBean {
 
     private ConfigRepository configRepo;
 
-    public ConfigMBeanImpl() throws NotCompliantMBeanException {
+    public Config() throws NotCompliantMBeanException {
         super(ConfigMBean.class);
     }
 

Modified: karaf/trunk/config/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/config/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1311858&r1=1311857&r2=1311858&view=diff
==============================================================================
--- karaf/trunk/config/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/trunk/config/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml Tue Apr 10 16:47:34 2012
@@ -22,6 +22,14 @@
            xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
            default-activation="lazy">
 
+    <ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]" />
+
+    <cm:property-placeholder persistent-id="org.apache.karaf.config">
+        <cm:default-properties>
+            <cm:property name="storage" value="$[karaf.base]/etc/"/>
+        </cm:default-properties>
+    </cm:property-placeholder>
+
     <bean id="configRepo" class="org.apache.karaf.config.core.impl.ConfigRepositoryImpl">
         <argument value="${storage}"/>
         <argument ref="configAdmin"/>
@@ -34,12 +42,13 @@
 
     <service interface="org.apache.karaf.config.core.ConfigRepository" ref="configRepo"/>
 
-    <ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]" />
-
-    <cm:property-placeholder persistent-id="org.apache.karaf.config">
-        <cm:default-properties>
-            <cm:property name="storage" value="$[karaf.base]/etc/"/>
-        </cm:default-properties>
-    </cm:property-placeholder>
+    <bean id="configMBean" class="org.apache.karaf.config.core.impl.Config">
+        <property name="configRepo" ref="configRepo"/>
+    </bean>
 
+    <service ref="configMBean" auto-export="interfaces">
+        <service-properties>
+            <entry key="jmx.objectname" value="org.apache.karaf:type=config,name=$[karaf.name]"/>
+        </service-properties>
+    </service>
 </blueprint>

Modified: karaf/trunk/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/config/pom.xml?rev=1311858&r1=1311857&r2=1311858&view=diff
==============================================================================
--- karaf/trunk/config/pom.xml (original)
+++ karaf/trunk/config/pom.xml Tue Apr 10 16:47:34 2012
@@ -36,7 +36,6 @@
     <modules>
         <module>core</module>
         <module>command</module>
-        <module>management</module>
     </modules>
 
 </project>

Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1311858&r1=1311857&r2=1311858&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Apr 10 16:47:34 2012
@@ -418,11 +418,6 @@
                 <artifactId>org.apache.karaf.config.command</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.config</groupId>
-                <artifactId>org.apache.karaf.config.management</artifactId>
-                <version>${project.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>org.apache.karaf.deployer</groupId>