Author: cschneider
Date: Fri Jul 8 13:40:18 2011
New Revision: 1144312
URL: http://svn.apache.org/viewvc?rev=1144312&view=rev
Log:
Change service reference to optional so the command remains up even when the
service is not there
Modified:
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java
karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
Modified:
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java?rev=1144312&r1=1144311&r2=1144312&view=diff
==============================================================================
---
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java
(original)
+++
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java
Fri Jul 8 13:40:18 2011
@@ -16,9 +16,15 @@
*/
package org.apache.karaf.shell.obr;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
import java.util.List;
-import java.util.Properties;
import org.apache.felix.bundlerepository.Reason;
import org.apache.felix.bundlerepository.Repository;
Modified:
karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml?rev=1144312&r1=1144311&r2=1144312&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
(original)
+++ karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
Fri Jul 8 13:40:18 2011
@@ -18,7 +18,10 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";
default-activation="lazy">
- <reference id="repoAdmin"
interface="org.apache.felix.bundlerepository.RepositoryAdmin"/>
+ <reference id="repoAdmin"
+ interface="org.apache.felix.bundlerepository.RepositoryAdmin"
+ availability="optional"
+ />
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0";>
<command name="obr/addUrl">
