Author: gnodet
Date: Wed Sep 15 14:47:54 2010
New Revision: 997355
URL: http://svn.apache.org/viewvc?rev=997355&view=rev
Log:
Move back the help command into the console jar
Added:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/HelpAction.java
- copied, changed from r997344,
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/HelpAction.java
karaf/trunk/shell/console/src/main/resources/META-INF/
karaf/trunk/shell/console/src/main/resources/META-INF/services/
karaf/trunk/shell/console/src/main/resources/META-INF/services/org/
karaf/trunk/shell/console/src/main/resources/META-INF/services/org/apache/
karaf/trunk/shell/console/src/main/resources/META-INF/services/org/apache/karaf/
karaf/trunk/shell/console/src/main/resources/META-INF/services/org/apache/karaf/shell/
karaf/trunk/shell/console/src/main/resources/META-INF/services/org/apache/karaf/shell/commands
Removed:
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/HelpAction.java
Modified:
karaf/trunk/shell/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands
karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml
Modified:
karaf/trunk/shell/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands?rev=997355&r1=997354&r2=997355&view=diff
==============================================================================
---
karaf/trunk/shell/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands
(original)
+++
karaf/trunk/shell/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands
Wed Sep 15 14:47:54 2010
@@ -4,7 +4,6 @@ org.apache.karaf.shell.commands.EachActi
org.apache.karaf.shell.commands.EchoAction
org.apache.karaf.shell.commands.ExecuteAction
org.apache.karaf.shell.commands.GrepAction
-org.apache.karaf.shell.commands.HelpAction
org.apache.karaf.shell.commands.HistoryAction
org.apache.karaf.shell.commands.IfAction
org.apache.karaf.shell.commands.JavaAction
Modified:
karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml?rev=997355&r1=997354&r2=997355&view=diff
==============================================================================
---
karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
(original)
+++
karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
Wed Sep 15 14:47:54 2010
@@ -20,10 +20,6 @@
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";>
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0";>
- <command name="*/help">
- <action class="org.apache.karaf.shell.commands.HelpAction"/>
- </command>
-
<command name="shell/cat">
<action class="org.apache.karaf.shell.commands.CatAction"/>
</command>
Copied:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/HelpAction.java
(from r997344,
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/HelpAction.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/HelpAction.java?p2=karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/HelpAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/HelpAction.java&r1=997344&r2=997355&rev=997355&view=diff
==============================================================================
---
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/HelpAction.java
(original)
+++
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/HelpAction.java
Wed Sep 15 14:47:54 2010
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.commands;
+package org.apache.karaf.shell.console;
import java.io.PrintStream;
import java.lang.reflect.Field;
@@ -31,9 +31,6 @@ import org.apache.felix.gogo.commands.Ar
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.basic.AbstractCommand;
import org.apache.felix.gogo.commands.basic.DefaultActionPreparator;
-import org.apache.felix.gogo.runtime.shell.CommandProxy;
-import org.apache.felix.gogo.runtime.shell.CommandSessionImpl;
-import org.apache.karaf.shell.console.AbstractAction;
import org.fusesource.jansi.Ansi;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
Added:
karaf/trunk/shell/console/src/main/resources/META-INF/services/org/apache/karaf/shell/commands
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/resources/META-INF/services/org/apache/karaf/shell/commands?rev=997355&view=auto
==============================================================================
---
karaf/trunk/shell/console/src/main/resources/META-INF/services/org/apache/karaf/shell/commands
(added)
+++
karaf/trunk/shell/console/src/main/resources/META-INF/services/org/apache/karaf/shell/commands
Wed Sep 15 14:47:54 2010
@@ -0,0 +1 @@
+org.apache.karaf.shell.console.HelpAction
Modified:
karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml?rev=997355&r1=997354&r2=997355&view=diff
==============================================================================
---
karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml
(original)
+++
karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml
Wed Sep 15 14:47:54 2010
@@ -41,5 +41,22 @@
<bean id="terminalFactory"
class="org.apache.karaf.shell.console.jline.TerminalFactory"
destroy-method="destroy"/>
+ <service>
+ <interfaces>
+ <value>org.osgi.service.command.Function</value>
+ <value>org.apache.karaf.shell.console.CompletableFunction</value>
+ </interfaces>
+ <service-properties>
+ <entry key="osgi.command.scope" value="*"/>
+ <entry key="osgi.command.function" value="help"/>
+ </service-properties>
+ <bean class="org.apache.karaf.shell.console.commands.BlueprintCommand">
+ <property name="blueprintContainer" ref="blueprintContainer"/>
+ <property name="blueprintConverter" ref="blueprintConverter"/>
+ <property name="actionId" value="help"/>
+ </bean>
+ </service>
+ <bean id="help" class="org.apache.karaf.shell.console.HelpAction"
activation="lazy" scope="prototype" />
+
</blueprint>
