Author: jbonofre
Date: Thu Sep 22 08:09:16 2011
New Revision: 1173985
URL: http://svn.apache.org/viewvc?rev=1173985&view=rev
Log:
[KARAF-786] Fix the import package to refer Felix utils, add the config create
operation
Modified:
karaf/trunk/management/mbeans/config/pom.xml
karaf/trunk/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/ConfigMBean.java
karaf/trunk/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java
karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml
Modified: karaf/trunk/management/mbeans/config/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/config/pom.xml?rev=1173985&r1=1173984&r2=1173985&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/config/pom.xml (original)
+++ karaf/trunk/management/mbeans/config/pom.xml Thu Sep 22 08:09:16 2011
@@ -86,7 +86,8 @@
</Import-Package>
<Private-Package>
org.apache.karaf.management.mbeans.config.internal,
- org.apache.felix.utils.properties
+ org.apache.felix.utils.properties,
+ !*
</Private-Package>
</instructions>
</configuration>
Modified:
karaf/trunk/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/ConfigMBean.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/ConfigMBean.java?rev=1173985&r1=1173984&r2=1173985&view=diff
==============================================================================
---
karaf/trunk/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/ConfigMBean.java
(original)
+++
karaf/trunk/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/ConfigMBean.java
Thu Sep 22 08:09:16 2011
@@ -31,6 +31,14 @@ public interface ConfigMBean {
List<String> list() throws Exception;
/**
+ * Create a new configuration for the given PID.
+ *
+ * @param pid the configuration PID.
+ * @throws Exception
+ */
+ void create(String pid) throws Exception;
+
+ /**
* Delete a configuration identified by the given PID.
*
* @param pid the configuration PID to delete.
Modified:
karaf/trunk/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java?rev=1173985&r1=1173984&r2=1173985&view=diff
==============================================================================
---
karaf/trunk/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java
(original)
+++
karaf/trunk/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java
Thu Sep 22 08:09:16 2011
@@ -22,12 +22,7 @@ import org.osgi.service.cm.Configuration
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
import java.io.File;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
/**
* Implementation of the ConfigMBean.
@@ -68,6 +63,10 @@ public class ConfigMBeanImpl extends Sta
return pids;
}
+ public void create(String pid) throws Exception {
+ store(pid, new Hashtable(), false);
+ }
+
public void delete(String pid) throws Exception {
Configuration configuration = configurationAdmin.getConfiguration(pid);
if (configuration == null) {
Modified:
karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml?rev=1173985&r1=1173984&r2=1173985&view=diff
==============================================================================
---
karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml
(original)
+++
karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml
Thu Sep 22 08:09:16 2011
@@ -14,8 +14,7 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";
xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0";
-
xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0";
- default-activation="lazy">
+
xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0";>
<!-- Reference to the MBean server -->
<reference id="mbeanServer" interface="javax.management.MBeanServer">
