You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/02/02 16:43:16 UTC

svn commit: r1066500 [2/2] - in /karaf/trunk: admin/command/src/main/java/org/apache/karaf/admin/command/ admin/command/src/main/resources/OSGI-INF/ admin/management/src/main/resources/OSGI-INF/ features/command/ features/command/src/main/resources/OSG...

Added: karaf/trunk/shell/log/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/shell/log/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/shell/log/src/main/resources/OSGI-INF/bundle.info Wed Feb  2 15:43:13 2011
@@ -0,0 +1,21 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.name}
+
+    ${project.description}
+
+    Maven URL:
+        \u001B[33mmvn:${project.groupId}/${project.artifactId}/${project.version}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    This bundle provides Karaf shell commands to manipulate the Log service.
+
+    The following commands are available:
+    \u001B[36mlog:clear\u001B[0m Clear log entries.
+    \u001B[36mlog:display-exception\u001B[0m Displays the last occurred exception from the log.
+    \u001B[36mlog:display\u001B[0m Displays log entries.
+    \u001B[36mlog:get\u001B[0m Shows the currently set log level.
+    \u001B[36mlog:tail\u001B[0m Continuously display log entries.
+    \u001B[36mlog:set\u001B[0m Sets the log level.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mCommands\u001B[0m and \u001B[36mLogging system\u001B[0m sections of the Karaf User Guide.
\ No newline at end of file

Modified: karaf/trunk/shell/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/obr/pom.xml (original)
+++ karaf/trunk/shell/obr/pom.xml Wed Feb  2 15:43:13 2011
@@ -30,10 +30,7 @@
     <artifactId>org.apache.karaf.shell.obr</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Shell :: OBR Commands</name>
-
-    <description>
-        Provides the OBR Shell commands.
-    </description>
+    <description>This bundle provides Karaf shell commands to manipulate the OBR service.</description>
 
     <properties>
         <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -69,6 +66,21 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*.info</include>
+                </includes>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>

Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/DeployCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/DeployCommand.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/DeployCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/DeployCommand.java Wed Feb  2 15:43:13 2011
@@ -22,7 +22,7 @@ import org.apache.felix.bundlerepository
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;
 
-@Command(scope = "obr", name = "deploy", description = "Deploys a list of bundles using OBR service")
+@Command(scope = "obr", name = "deploy", description = "Deploys a list of bundles using OBR service.")
 public class DeployCommand extends ObrCommandSupport {
 
     @Argument(index = 0, name = "bundles", description = "List of bundle names to deploy (separated by whitespaces)", required = true, multiValued = true)

Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java Wed Feb  2 15:43:13 2011
@@ -29,7 +29,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-@Command(scope = "obr", name = "find", description = "Find OBR bundles for a given filter")
+@Command(scope = "obr", name = "find", description = "Find OBR bundles for a given filter.")
 public class FindCommand extends ObrCommandSupport {
 
     @Argument(index = 0, name = "requirements", description = "Requirement", required = true, multiValued = true)

Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/InfoCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/InfoCommand.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/InfoCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/InfoCommand.java Wed Feb  2 15:43:13 2011
@@ -29,7 +29,7 @@ import org.apache.felix.bundlerepository
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;
 
-@Command(scope = "obr", name = "info", description = "Prints information about OBR bundles")
+@Command(scope = "obr", name = "info", description = "Prints information about OBR bundles.")
 public class InfoCommand extends ObrCommandSupport {
 
     @Argument(index = 0, name = "bundles", description = "Specify bundles to query for information (separated by whitespaces)", required = true, multiValued = true)

Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java Wed Feb  2 15:43:13 2011
@@ -24,7 +24,7 @@ import org.osgi.framework.Version;
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;
 
-@Command(scope = "obr", name = "list", description = "Lists OBR bundles")
+@Command(scope = "obr", name = "list", description = "Lists OBR bundles.")
 public class ListCommand extends ObrCommandSupport {
 
     @Argument(index = 0, name = "args", description = "The arguments", required = false, multiValued = true)

Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ResolveCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ResolveCommand.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ResolveCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ResolveCommand.java Wed Feb  2 15:43:13 2011
@@ -30,7 +30,7 @@ import org.apache.felix.gogo.commands.Ar
 import org.apache.felix.gogo.commands.Command;
 import org.apache.felix.gogo.commands.Option;
 
-@Command(scope = "obr", name = "resolve", description = "Show the resolution output for a given set of requirements")
+@Command(scope = "obr", name = "resolve", description = "Shows the resolution output for a given set of requirements.")
 public class ResolveCommand extends ObrCommandSupport {
 
     @Option(name = "-w", aliases = "--why", description = "Display the reason of the inclusion of the resource")

Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/SourceCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/SourceCommand.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/SourceCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/SourceCommand.java Wed Feb  2 15:43:13 2011
@@ -27,7 +27,7 @@ import org.apache.felix.gogo.commands.Ar
 import org.apache.felix.gogo.commands.Command;
 import org.apache.karaf.shell.obr.util.FileUtil;
 
-@Command(scope = "obr", name = "source", description = "Download the sources for an OBR bundle.")
+@Command(scope = "obr", name = "source", description = "Downloads the sources for an OBR bundle.")
 public class SourceCommand extends ObrCommandSupport {
 
     @Option(name = "-x", aliases = {}, description = "Extract the archive", required = false, multiValued = false)

Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/StartCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/StartCommand.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/StartCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/StartCommand.java Wed Feb  2 15:43:13 2011
@@ -19,7 +19,7 @@ package org.apache.karaf.shell.obr;
 import org.apache.felix.bundlerepository.RepositoryAdmin;
 import org.apache.felix.gogo.commands.Command;
 
-@Command(scope = "obr", name = "start", description = "Deploy and start a list of bundles using OBR.")
+@Command(scope = "obr", name = "start", description = "Deploys and starts a list of bundles using OBR.")
 public class StartCommand extends DeployCommand {
 
     protected void doExecute(RepositoryAdmin admin) throws Exception {

Added: karaf/trunk/shell/obr/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/shell/obr/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/shell/obr/src/main/resources/OSGI-INF/bundle.info Wed Feb  2 15:43:13 2011
@@ -0,0 +1,26 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.name}
+
+    ${project.description}
+
+    Maven URL:
+        \u001B[33mmvn:${project.groupId}/${project.artifactId}/${project.version}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    This bundle provides Karaf shell commands to manipulate the Karaf embedded OBR (OSGi Bundle Repository).
+
+    The following commands are available:
+    \u001B[36mobr:addUrl\u001B[0m Adds a list of repository URLs to the OBR service.
+    \u001B[36mobr:deploy\u001B[0m Deploys a list of bundles using OBR service.
+    \u001B[36mobr:find\u001B[0m Find OBR bundles for a given filter.
+    \u001B[36mobr:info\u001B[0m Prints information about OBR bundles.
+    \u001B[36mobr:list\u001B[0m Lists OBR bundles.
+    \u001B[36mobr:listUrl\u001B[0m Displays the repository URLs currently associated with the OBR service.
+    \u001B[36mobr:refreshUrl\u001B[0m Reloads the repositories to obtain a fresh list of bundles.
+    \u001B[36mobr:removeUrl\u001B[0m Removes a list of repository URLs from the OBR service.
+    \u001B[36mobr:resolve\u001B[0m Shows the resolution output for a given set of requirements.
+    \u001B[36mobr:source\u001B[0m Downloads the sources for an OBR bundle.
+    \u001B[36mobr:start\u001B[0m Deploys and starts a list of bundles using OBR.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mCommands\u001B[0m and \u001B[36mProvisioning\u001B[0m sections of the Karaf User Guide.
\ No newline at end of file