You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2011/02/11 17:40:03 UTC
svn commit: r1069870 - in /karaf/trunk:
shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
tooling/cmdhelp-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java
Author: gnodet
Date: Fri Feb 11 16:40:03 2011
New Revision: 1069870
URL: http://svn.apache.org/viewvc?rev=1069870&view=rev
Log:
[KARAF-455] Improve confluence output for commands by adding extended information when available
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
karaf/trunk/tooling/cmdhelp-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java
Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java?rev=1069870&r1=1069869&r2=1069870&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java Fri Feb 11 16:40:03 2011
@@ -497,7 +497,7 @@ public class DefaultActionPreparator imp
}
}
- private String loadDescription(Class clazz, String desc) {
+ protected String loadDescription(Class clazz, String desc) {
if (desc.startsWith("classpath:")) {
InputStream is = clazz.getResourceAsStream(desc.substring("classpath:".length()));
if (is == null) {
Modified: karaf/trunk/tooling/cmdhelp-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/cmdhelp-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java?rev=1069870&r1=1069869&r2=1069870&view=diff
==============================================================================
--- karaf/trunk/tooling/cmdhelp-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java (original)
+++ karaf/trunk/tooling/cmdhelp-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java Fri Feb 11 16:40:03 2011
@@ -49,6 +49,7 @@ import org.apache.maven.plugin.MojoFailu
import org.apache.maven.project.MavenProject;
import org.apache.xbean.finder.ClassFinder;
import org.apache.felix.service.command.CommandSession;
+import org.fusesource.jansi.Ansi;
/**
* Generates docbook for Karaf commands
@@ -394,6 +395,11 @@ public class CmdHelpMojo extends Abstrac
}
out.println();
}
+ if (command.detailedDescription().length() > 0) {
+ out.println("h2. Details");
+ String desc = loadDescription(action.getClass(), command.detailedDescription());
+ out.println(desc);
+ }
out.println();
}