You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/11/24 23:43:45 UTC
svn commit: r1206006 - in /karaf/branches/karaf-2.2.x/shell/config/src/main:
java/org/apache/karaf/shell/config/ConfigPropertyCommandSupport.java
resources/OSGI-INF/blueprint/shell-config.xml
Author: iocanel
Date: Thu Nov 24 22:43:44 2011
New Revision: 1206006
URL: http://svn.apache.org/viewvc?rev=1206006&view=rev
Log:
[KARAF-1035] Added control for non existent pid when using the --pid option.
Conflicts:
shell/config/src/main/java/org/apache/karaf/shell/config/ConfigPropertyCommandSupport.java
shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
Modified:
karaf/branches/karaf-2.2.x/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigPropertyCommandSupport.java
karaf/branches/karaf-2.2.x/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
Modified: karaf/branches/karaf-2.2.x/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigPropertyCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigPropertyCommandSupport.java?rev=1206006&r1=1206005&r2=1206006&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigPropertyCommandSupport.java (original)
+++ karaf/branches/karaf-2.2.x/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigPropertyCommandSupport.java Thu Nov 24 22:43:44 2011
@@ -1,7 +1,9 @@
package org.apache.karaf.shell.config;
import java.util.Dictionary;
+
import org.apache.felix.gogo.commands.Option;
+import java.util.Properties;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
@@ -19,9 +21,12 @@ public abstract class ConfigPropertyComm
protected void doExecute(ConfigurationAdmin admin) throws Exception {
Dictionary props = getEditedProps();
- if (props == null) {
+ if (props == null && pid == null) {
System.err.println("No configuration is being edited--run the edit command first");
} else {
+ if (props == null) {
+ props = new Properties();
+ }
propertyAction(props);
if(requiresUpdate(pid)) {
update(admin, pid, props, bypassStorage);
Modified: karaf/branches/karaf-2.2.x/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml?rev=1206006&r1=1206005&r2=1206006&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml Thu Nov 24 22:43:44 2011
@@ -48,7 +48,9 @@
<action class="org.apache.karaf.shell.config.ListCommand"/>
</command>
<command name="config/propdel">
- <action class="org.apache.karaf.shell.config.PropDelCommand"/>
+ <action class="org.apache.karaf.shell.config.PropDelCommand">
+ <property name="storage" value="${storage}" />
+ </action>
<completers>
<ref component-id="configPropertyCompleter" />
<null/>
@@ -58,14 +60,18 @@
<action class="org.apache.karaf.shell.config.PropListCommand"/>
</command>
<command name="config/propset">
- <action class="org.apache.karaf.shell.config.PropSetCommand"/>
+ <action class="org.apache.karaf.shell.config.PropSetCommand">
+ <property name="storage" value="${storage}" />
+ </action>
<completers>
<ref component-id="configPropertyCompleter" />
<null/>
</completers>
</command>
<command name="config/propappend">
- <action class="org.apache.karaf.shell.config.PropAppendCommand"/>
+ <action class="org.apache.karaf.shell.config.PropAppendCommand">
+ <property name="storage" value="${storage}" />
+ </action>
<completers>
<ref component-id="configPropertyCompleter" />
<null/>