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 [1/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...
Author: jbonofre
Date: Wed Feb 2 15:43:13 2011
New Revision: 1066500
URL: http://svn.apache.org/viewvc?rev=1066500&view=rev
Log:
[KARAF-403] Add OSGI-INF/bundle.info in all Karaf bundles.
Added:
karaf/trunk/features/command/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/features/core/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/features/management/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/features/obr/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/jaas/boot/src/main/resources/
karaf/trunk/jaas/boot/src/main/resources/OSGI-INF/
karaf/trunk/jaas/boot/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/jaas/command/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/jaas/config/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/jaas/jasypt/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/main/src/main/resources/OSGI-INF/
karaf/trunk/main/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/management/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/shell/commands/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/shell/config/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/shell/console/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/shell/dev/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/shell/log/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/shell/obr/src/main/resources/OSGI-INF/bundle.info
Modified:
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ListCommand.java
karaf/trunk/admin/command/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/admin/management/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/features/command/pom.xml
karaf/trunk/features/core/pom.xml
karaf/trunk/features/management/pom.xml
karaf/trunk/features/obr/pom.xml
karaf/trunk/jaas/boot/pom.xml
karaf/trunk/jaas/command/pom.xml
karaf/trunk/jaas/config/pom.xml
karaf/trunk/jaas/jasypt/pom.xml
karaf/trunk/jaas/modules/pom.xml
karaf/trunk/main/pom.xml
karaf/trunk/management/pom.xml
karaf/trunk/shell/commands/pom.xml
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/CatAction.java
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/ClearAction.java
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/EchoAction.java
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/ExecuteAction.java
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/GrepAction.java
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/HistoryAction.java
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/JavaAction.java
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/LogoutAction.java
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/MoreAction.java
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/PrintfAction.java
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/SleepAction.java
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/SortAction.java
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/TacAction.java
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/TailAction.java
karaf/trunk/shell/config/pom.xml
karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/CancelCommand.java
karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/EditCommand.java
karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java
karaf/trunk/shell/console/pom.xml
karaf/trunk/shell/dev/pom.xml
karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/DynamicImport.java
karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java
karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/PrintStackTraces.java
karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/Restart.java
karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/ShowBundleTree.java
karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/Watch.java
karaf/trunk/shell/log/pom.xml
karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayException.java
karaf/trunk/shell/obr/pom.xml
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/DeployCommand.java
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/InfoCommand.java
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ResolveCommand.java
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/SourceCommand.java
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/StartCommand.java
Modified: karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ListCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ListCommand.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ListCommand.java (original)
+++ karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/ListCommand.java Wed Feb 2 15:43:13 2011
@@ -23,7 +23,7 @@ import org.apache.karaf.admin.Instance;
/**
* List available instances
*/
-@Command(scope = "admin", name = "list", description = "List all existing container instances.")
+@Command(scope = "admin", name = "list", description = "Lists all existing container instances.")
public class ListCommand extends AdminCommandSupport {
@Option(name = "-l", aliases = { "--location" }, description = "Displays the location of the container instances", required = false, multiValued = false)
Modified: karaf/trunk/admin/command/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/command/src/main/resources/OSGI-INF/bundle.info?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/resources/OSGI-INF/bundle.info (original)
+++ karaf/trunk/admin/command/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 15:43:13 2011
@@ -9,17 +9,17 @@
\u001B[1mDESCRIPTION\u001B[0m
This bundle contains all Karaf shell commands related to admin feature.
- Admin commands available are:
- - \u001B[36madmin:create\u001B[0m
- - \u001B[36madmin:connect\u001B[0m
- - \u001B[36madmin:list\u001B[0m
- - \u001B[36madmin:start\u001B[0m
- - \u001B[36madmin:stop\u001B[0m
- - \u001B[36madmin:destroy\u001B[0m
- - \u001B[36madmin:rename\u001B[0m
- - \u001B[36madmin:change-ssh-port\u001B[0m
- - \u001B[36madmin:change-rmi-registry-port\u001B[0m
- - \u001B[36madmin:change-opts\u001B[0m
+ The following commands are available:
+ \u001B[36madmin:create\u001B[0m Creates a new container instance.
+ \u001B[36madmin:connect\u001B[0m Connects to an existing container instance.
+ \u001B[36madmin:list\u001B[0m Lists all existing container instances.
+ \u001B[36madmin:start\u001B[0m Starts an existing container instance.
+ \u001B[36madmin:stop\u001B[0m Stops an existing container instance.
+ \u001B[36madmin:destroy\u001B[0m Destroys an existing container instance.
+ \u001B[36madmin:rename\u001B[0m Renames an existing container instance.
+ \u001B[36madmin:change-ssh-port\u001B[0m Changes the secure shell port of an existing container instance.
+ \u001B[36madmin:change-rmi-registry-port\u001B[0m Changes the RMI registry port (used by management layer) of an existing container instance.
+ \u001B[36madmin:change-opts\u001B[0m Changes the java options of an existing container instance.
\u001B[1mSEE ALSO\u001B[0m
\u001B[31mCommands\u001B[0m section of the Karaf User Guide.
\ No newline at end of file
Modified: karaf/trunk/admin/management/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/management/src/main/resources/OSGI-INF/bundle.info?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/admin/management/src/main/resources/OSGI-INF/bundle.info (original)
+++ karaf/trunk/admin/management/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 15:43:13 2011
@@ -13,14 +13,14 @@
JConsole).
On this AdminServiceMBean, you have the following operations available:
- - \u001B[36mcreateInstance\u001B[0m
- - \u001B[36mchangeSshPort\u001B[0m
- - \u001B[36mchangeRmiRegistryPort\u001B[0m
- - \u001B[36mchangeJavaOpts\u001B[0m
- - \u001B[36mdestroyInstance\u001B[0m
- - \u001B[36mstartInstance\u001B[0m
- - \u001B[36mstopInstance\u001B[0m
- - \u001B[36mrenameInstance\u001B[0m
+ \u001B[36mcreateInstance(name, sshPort, rmiPort, location, javaOpts, features, featureURLs)\u001B[0m Creates a new Karaf instance.
+ \u001B[36mchangeSshPort(name, port)\u001B[0m Changes the SSH port number of an existing Karaf instance.
+ \u001B[36mchangeRmiRegistryPort(name, port)\u001B[0m Changes the RMI registry port number of an existing Karaf instance.
+ \u001B[36mchangeJavaOpts(name, javaopts)\u001B[0m Changes the Java options of an existing Karaf instance.
+ \u001B[36mdestroyInstance(name)\u001B[0m Destroys an existing Karaf instance.
+ \u001B[36mstartInstance(name)\u001B[0m Starts an existing Karaf instance.
+ \u001B[36mstopInstance(name)\u001B[0m Stops an existing Karaf instance.
+ \u001B[36mrenameInstance(originalName, newName)\u001B[0m Renames an existing Karaf instance.
\u001B[1mSEE ALSO\u001B[0m
\u001B[31mRemote Management via JMX\u001B[0m in the Karaf User Guide.
\ No newline at end of file
Modified: karaf/trunk/features/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/features/command/pom.xml (original)
+++ karaf/trunk/features/command/pom.xml Wed Feb 2 15:43:13 2011
@@ -30,6 +30,7 @@
<artifactId>org.apache.karaf.features.command</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Features :: Command</name>
+ <description>This bundle provides the Karaf shell commands to manipulate features.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -91,6 +92,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>
Added: karaf/trunk/features/command/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/features/command/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/features/command/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 the Karaf shell commands to manipulate features.
+
+ The following commands are available:
+ \u001B[36mfeatures:addUrl\u001B[0m Adds a list of repository URLs to the features service.
+ \u001B[36mfeatures:info\u001B[0m Shows information about selected information.
+ \u001B[36mfeatures:install\u001B[0m Installs a feature with the specified name and version.
+ \u001B[36mfeatures:list\u001B[0m Lists all existing features available from the defined repositories.
+ \u001B[36mfeatures:listVersions\u001B[0m Lists all versions of a feature available from the currently available repositories.
+ \u001B[36mfeatures:listRepositories\u001B[0m Displays a list of all defined repositories.
+ \u001B[36mfeatures:listUrl\u001B[0m Displays a list of all defined repository URLs.
+ \u001B[36mfeatures:refreshUrl\u001B[0m Reloads the list of available features from the repositories.
+ \u001B[36mfeatures:removeRepository\u001B[0m Removes the specified repository features service.
+ \u001B[36mfeatures:removeUrl\u001B[0m Removes the given list of repository URLs from the features service.
+ \u001B[36mfeatures:uninstall\u001B[0m Uninstalls a feature with the specified name and version.
+
+\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
Modified: karaf/trunk/features/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/features/core/pom.xml (original)
+++ karaf/trunk/features/core/pom.xml Wed Feb 2 15:43:13 2011
@@ -30,6 +30,7 @@
<artifactId>org.apache.karaf.features.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Features :: Core</name>
+ <description>This bundle is the core implementation of the Karaf features support.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -91,6 +92,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>
Added: karaf/trunk/features/core/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/features/core/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/features/core/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 15:43:13 2011
@@ -0,0 +1,17 @@
+\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 is the core implementation of the Karaf features support.
+
+ Karaf provides a simple, yet flexible, way to provision applications or "features". Such a mechanism is mainly
+ provided by a set of commands available in the features shell. The provisioning system uses xml "repositories"
+ that define a set of features.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mProvisioning\u001B[0m section of the Karaf User Guide.
\ No newline at end of file
Modified: karaf/trunk/features/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/management/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/features/management/pom.xml (original)
+++ karaf/trunk/features/management/pom.xml Wed Feb 2 15:43:13 2011
@@ -30,6 +30,7 @@
<artifactId>org.apache.karaf.features.management</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Features :: Management</name>
+ <description>This bundle provides MBeans to manipulate features via JMX.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -96,6 +97,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>
Added: karaf/trunk/features/management/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/features/management/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/features/management/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/features/management/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 15:43:13 2011
@@ -0,0 +1,23 @@
+\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 provide MBean to manipulate Karaf features via JMX.
+
+ Especially, it provides the FeaturesServiceMBean supporting the following operations:
+ \u001B[36mgetFeatures()\u001B[0m Gets the list of features with the current status (installed or uninstalled).
+ \u001B[36mgetRepositories()\u001B[0m Gets the list of features repositories.
+ \u001B[36maddRepository(url)\u001B[0m Adds a new repository URL in the repositories set.
+ \u001B[36mremoveRepository(url)\u001B[0m Removes a repository URL from the repositories set.
+ \u001B[36minstallFeature(name)\u001B[0m Installs a feature identified by name.
+ \u001B[36minstallFeature(name, version)\u001B[0m Installs a feature identified by name and version.
+ \u001B[36muninstallFeature(name)\u001B[0m Uninstalls a feature identified by name.
+ \u001B[36muninstallFeature(name, version)\u001B[0m Uninstalls a feature identified by name and version.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mProvisioning\u001B[0m and \u001B[Remote Management via JMX\u001B[0m sections of the Karaf User Guide.
\ No newline at end of file
Modified: karaf/trunk/features/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/obr/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/features/obr/pom.xml (original)
+++ karaf/trunk/features/obr/pom.xml Wed Feb 2 15:43:13 2011
@@ -30,6 +30,7 @@
<artifactId>org.apache.karaf.features.obr</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Features :: OBR Resolver</name>
+ <description>This bundle provide OBR (OSGi Bundle Repository) support for Karaf features.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -61,6 +62,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>
Added: karaf/trunk/features/obr/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/features/obr/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/features/obr/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/features/obr/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 15:43:13 2011
@@ -0,0 +1,15 @@
+\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 the OBR (OSGi Bundle Repository) support for Karaf features.
+
+ It allows you to use an OBR resolver for bundle.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mProvisioning\u001B[0m section of the Karaf User Guide.
\ No newline at end of file
Modified: karaf/trunk/jaas/boot/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/boot/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/jaas/boot/pom.xml (original)
+++ karaf/trunk/jaas/boot/pom.xml Wed Feb 2 15:43:13 2011
@@ -30,10 +30,7 @@
<artifactId>org.apache.karaf.jaas.boot</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: JAAS :: Boot</name>
-
- <description>
- Provides the JAAS Boot classes.
- </description>
+ <description>Provides the JAAS classes loading at boot process.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -48,6 +45,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>
Added: karaf/trunk/jaas/boot/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/boot/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/jaas/boot/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/jaas/boot/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 15:43:13 2011
@@ -0,0 +1,22 @@
+\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 JAAS classes loaded during Karaf boot process.
+
+ Especially, it provides the ProxyLoginModule.
+
+ The ProxyLoginModule is an OSGi proxy login module that should be used instead of a plain reference to
+ a given login module. It takes two properties, the name of the login module class, and the bundle to be used
+ to load it.
+ This class must be available from all modules, so it has to be either in a fragment bundle attached to the
+ system bundle or be made available through the boot delegation class path.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mSecurity\u001B[0m section of the Karaf User Guide.
+ \u001B[36mSecurity Framework\u001B[0m section of the Karaf Developer Guide.
\ No newline at end of file
Modified: karaf/trunk/jaas/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/command/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/jaas/command/pom.xml (original)
+++ karaf/trunk/jaas/command/pom.xml Wed Feb 2 15:43:13 2011
@@ -32,6 +32,7 @@
<artifactId>org.apache.karaf.jaas.command</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Jaas :: Command</name>
+ <description>This bundle provides Karaf shell commands to manipulate JAAS security framework.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -99,6 +100,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>
Added: karaf/trunk/jaas/command/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/jaas/command/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/jaas/command/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 JAAS security framework.
+
+ The following commands are available:
+ \u001B[36mjaas:cancel\u001B[0m Cancel the modification of a JAAS realm.
+ \u001B[36mjaas:pending\u001B[0m Lists the modification on the active realm/module.
+ \u001B[36mjaas:list\u001B[0m Lists the modification on the active realm/module.
+ \u001B[36mjaas:userlist\u001B[0m Lists the users of the active realm/module.
+ \u001B[36mjaas:manage\u001B[0m Manage user and roles of a Jaas Realm.
+ \u001B[36mjaas:roleadd\u001B[0m Add a role to a user.
+ \u001B[36mjaas:roledel\u001B[0m Delete a role from a user.
+ \u001B[36mjaas:update\u001B[0m Update JAAS realm.
+ \u001B[36mjaas:useradd\u001B[0m Add a user.
+ \u001B[36mjaas:userdel\u001B[0m Delete a user.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mSecurity\u001B[0m section of the Karaf User Guide.
+ \u001B[36mSeucrity Framework\u001B[0m section of the Karaf Developer Guide.
\ No newline at end of file
Modified: karaf/trunk/jaas/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/config/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/jaas/config/pom.xml (original)
+++ karaf/trunk/jaas/config/pom.xml Wed Feb 2 15:43:13 2011
@@ -30,10 +30,7 @@
<artifactId>org.apache.karaf.jaas.config</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: JAAS :: Config</name>
-
- <description>
- Provides the JAAS Config.
- </description>
+ <description>This bundle provides the configuration facility for the JAAS security framework.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -68,6 +65,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>
Added: karaf/trunk/jaas/config/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/jaas/config/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/jaas/config/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 15:43:13 2011
@@ -0,0 +1,18 @@
+\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 manage the configuration of the JAAS security framework.
+
+ Especially it's the initializer of the JAAS ProxyLoginModule and manage the Karaf JAAS namespaces:
+ \u001B[33mhttp://karaf.apache.org/xmlns/jaas/v1.0.0\u001B[0m
+ \u001B[33mhttp://karaf.apache.org/xmlns/jaas/v1.1.0\u001B[0m
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mSecurity\u001B[0m section of the Karaf User Guide.
+ \u001B[36mSecurity Framework\u001B[0m section of the Karaf Developer Guide.
\ No newline at end of file
Modified: karaf/trunk/jaas/jasypt/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/jasypt/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/jaas/jasypt/pom.xml (original)
+++ karaf/trunk/jaas/jasypt/pom.xml Wed Feb 2 15:43:13 2011
@@ -30,12 +30,7 @@
<artifactId>org.apache.karaf.jaas.jasypt</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: JAAS :: Jasypt Encryption</name>
-
- <description>
- This bundle provides the default encryption implementation for password
- encryption used in login module.
- This implementation uses Jasypt encryption tool.
- </description>
+ <description>This bundle provide Jasypt service for the encryption support in the JAAS security framework.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -63,6 +58,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>
Added: karaf/trunk/jaas/jasypt/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/jasypt/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/jaas/jasypt/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/jaas/jasypt/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 uses Jasypt tool to provide encryption support in the JAAS security framework.
+
+ Jasypt is a java library which allows the developer to add basic encryption capabilities to his/her projects
+ with minimum effort, and without the need of having deep knowledge on how cryptography works.
+
+ * High-security, standards-based encryption techniques, both for unidirectional and bidirectional encryption.
+ Encrypt passwords, texts, numbers, binaries...
+ * Transparent integration with Hibernate.
+ * Suitable for integration into Spring-based applications and also transparently integrable with Spring Security.
+ * Integrated capabilities for encrypting the configuration of applications (i.e. datasources).
+ * Specific features for high-performance encryption in multi-processor/multi-core systems.
+ * Open API for use with any JCE provider.
+ * ...and much more
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mSecurity Framework\u001B[0m section of the Karaf Developer Guide.
+ \u001B[36mhttp://www.jasypt.org/\u001B[0m
\ No newline at end of file
Modified: karaf/trunk/jaas/modules/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/pom.xml (original)
+++ karaf/trunk/jaas/modules/pom.xml Wed Feb 2 15:43:13 2011
@@ -30,10 +30,7 @@
<artifactId>org.apache.karaf.jaas.modules</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: JAAS :: Modules</name>
-
- <description>
- Provides the JAAS Modules.
- </description>
+ <description>This bundle provides JAAS modules which can be used in Karaf (LDAP, JDBC, etc).</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -86,6 +83,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>
Added: karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 15:43:13 2011
@@ -0,0 +1,20 @@
+\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 several JAAS modules depending of the target backend that you want to use.
+
+ Currently, Karaf provides login module for:
+ - JDBC to use a database backend
+ - LDAP to use a LDAP backend
+ - Properties to use a simple properties file
+
+ The default encryption facility is also provided by this bundle.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mSecurity Framework\u001B[0m section of the Karaf Developer Guide.
\ No newline at end of file
Modified: karaf/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/main/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/main/pom.xml (original)
+++ karaf/trunk/main/pom.xml Wed Feb 2 15:43:13 2011
@@ -30,6 +30,8 @@
<artifactId>org.apache.karaf.main</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Main</name>
+ <description>This bundle is the main Karaf launcher. It's responsible of the Karaf startup including
+ the console, branding, etc bootstrap.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
@@ -63,7 +65,23 @@
<scope>test</scope>
</dependency>
</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>
Added: karaf/trunk/main/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/main/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/main/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 15:43:13 2011
@@ -0,0 +1,15 @@
+\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 is responsible of the main Karaf startup.
+
+ Especially it manages the bootstrap of the low level Karaf services such as the embedded Derby database, locking
+ facilities, etc.
+
+\u001B[1mSEE ALSO\u001B[0m
Modified: karaf/trunk/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/management/pom.xml (original)
+++ karaf/trunk/management/pom.xml Wed Feb 2 15:43:13 2011
@@ -30,6 +30,8 @@
<artifactId>org.apache.karaf.management</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Management</name>
+ <description>This bundle starts the Karaf embedded MBean server and RMI registry allowing users
+ to use JMX to manage Karaf.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
@@ -65,6 +67,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>
Added: karaf/trunk/management/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/management/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/management/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/management/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 15:43:13 2011
@@ -0,0 +1,15 @@
+\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 starts JMX required resources such as MBean server and RMI registry.
+
+ It allows end users to manage Karaf using any JMX client such as JConsole.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mManagement\u001B[0m section of the Karaf User Guide.
\ No newline at end of file
Modified: karaf/trunk/shell/commands/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/commands/pom.xml (original)
+++ karaf/trunk/shell/commands/pom.xml Wed Feb 2 15:43:13 2011
@@ -30,10 +30,7 @@
<artifactId>org.apache.karaf.shell.commands</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Shell :: Various Commands</name>
-
- <description>
- Provides SSH support to the console.
- </description>
+ <description>This bundles provides basic Karaf shell commands.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -77,6 +74,13 @@
<include>**/*</include>
</includes>
</resource>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.info</include>
+ </includes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/CatAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/CatAction.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/CatAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/CatAction.java Wed Feb 2 15:43:13 2011
@@ -35,7 +35,7 @@ import org.apache.felix.gogo.commands.Co
*
* @version $Rev: 593392 $ $Date: 2007-11-09 03:14:15 +0100 (Fri, 09 Nov 2007) $
*/
-@Command(scope = "shell", name = "cat", description = "Displays the content of a file or url")
+@Command(scope = "shell", name = "cat", description = "Displays the content of a file or URL.")
public class CatAction extends AbstractAction {
@Option(name = "-n", aliases = {}, description = "The number the output lines, starting at 1.", required = false, multiValued = false)
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/ClearAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/ClearAction.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/ClearAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/ClearAction.java Wed Feb 2 15:43:13 2011
@@ -22,7 +22,7 @@ import org.apache.karaf.shell.console.Ab
/**
* A command to clear the console buffer
*/
-@Command(scope = "shell", name = "clear", description = "Clears the console buffer")
+@Command(scope = "shell", name = "clear", description = "Clears the console buffer.")
public class ClearAction extends AbstractAction {
protected Object doExecute() throws Exception {
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/EchoAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/EchoAction.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/EchoAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/EchoAction.java Wed Feb 2 15:43:13 2011
@@ -23,7 +23,7 @@ import org.apache.felix.gogo.commands.Op
import org.apache.felix.gogo.commands.Argument;
import org.apache.karaf.shell.console.AbstractAction;
-@Command(scope = "shell", name = "echo", description="Echoes or prints arguments to STDOUT")
+@Command(scope = "shell", name = "echo", description="Echoes or prints arguments to STDOUT.")
public class EchoAction extends AbstractAction
{
@Option(name = "-n", aliases = {}, description = "Do not print the trailing newline character", required = false, multiValued = false)
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/ExecuteAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/ExecuteAction.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/ExecuteAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/ExecuteAction.java Wed Feb 2 15:43:13 2011
@@ -28,7 +28,7 @@ import org.apache.karaf.util.process.Pum
*
* @version $Rev: 593392 $ $Date: 2007-11-09 03:14:15 +0100 (Fri, 09 Nov 2007) $
*/
-@Command(scope = "shell", name = "exec", description = "Executes system processes")
+@Command(scope = "shell", name = "exec", description = "Executes system processes.")
public class ExecuteAction extends AbstractAction {
@Argument(index = 0, name = "command", description = "Execution command with arguments", required = true, multiValued = true)
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/GrepAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/GrepAction.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/GrepAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/GrepAction.java Wed Feb 2 15:43:13 2011
@@ -33,7 +33,7 @@ import org.apache.felix.gogo.commands.Co
import org.fusesource.jansi.Ansi;
-@Command(scope = "shell", name="grep", description="Prints lines matching the given pattern", detailedDescription="classpath:grep.txt")
+@Command(scope = "shell", name="grep", description="Prints lines matching the given pattern.", detailedDescription="classpath:grep.txt")
public class GrepAction extends AbstractAction {
public static enum ColorOption {
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/HistoryAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/HistoryAction.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/HistoryAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/HistoryAction.java Wed Feb 2 15:43:13 2011
@@ -24,7 +24,7 @@ import org.fusesource.jansi.Ansi;
/**
* History command
*/
-@Command(scope = "shell", name="history", description="Prints command history")
+@Command(scope = "shell", name="history", description="Prints command history.")
public class HistoryAction extends AbstractAction {
@Override
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java Wed Feb 2 15:43:13 2011
@@ -40,7 +40,7 @@ import org.apache.karaf.shell.commands.i
import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.fusesource.jansi.Ansi;
-@Command(scope = "shell", name = "info", description = "Prints system informations")
+@Command(scope = "shell", name = "info", description = "Prints system information.")
public class InfoAction extends OsgiCommandSupport {
private NumberFormat fmtI = new DecimalFormat("###,###", new DecimalFormatSymbols(Locale.ENGLISH));
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/JavaAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/JavaAction.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/JavaAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/JavaAction.java Wed Feb 2 15:43:13 2011
@@ -33,7 +33,7 @@ import org.apache.karaf.shell.console.Ab
*
* @version $Rev: 593392 $ $Date: 2007-11-09 03:14:15 +0100 (Fri, 09 Nov 2007) $
*/
-@Command(scope = "shell", name = "java", description = "Execute a Java standard application")
+@Command(scope = "shell", name = "java", description = "Executes a Java standard application.")
public class JavaAction extends AbstractAction {
@Option(name = "-m", aliases = {"--method"}, description = "Invoke a named method", required = false, multiValued = false)
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/LogoutAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/LogoutAction.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/LogoutAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/LogoutAction.java Wed Feb 2 15:43:13 2011
@@ -20,7 +20,7 @@ import org.apache.felix.gogo.commands.Co
import org.apache.karaf.shell.console.AbstractAction;
import org.apache.karaf.shell.console.CloseShellException;
-@Command(scope = "shell", name = "logout", description = "Disconnect shell from current session")
+@Command(scope = "shell", name = "logout", description = "Disconnects shell from current session.")
public class LogoutAction extends AbstractAction {
protected Object doExecute() throws Exception {
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/MoreAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/MoreAction.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/MoreAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/MoreAction.java Wed Feb 2 15:43:13 2011
@@ -29,7 +29,7 @@ import org.apache.felix.gogo.commands.Co
import org.apache.felix.gogo.commands.Option;
import org.apache.karaf.shell.console.AbstractAction;
-@Command(scope = "shell", name = "more", description = "file pager")
+@Command(scope = "shell", name = "more", description = "File pager.")
public class MoreAction extends AbstractAction {
@Option(name = "--lines", description = "stop after N lines")
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/PrintfAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/PrintfAction.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/PrintfAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/PrintfAction.java Wed Feb 2 15:43:13 2011
@@ -22,7 +22,7 @@ import org.apache.karaf.shell.console.Ab
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-@Command(scope = "shell", name = "printf", description = "Format and print arguments")
+@Command(scope = "shell", name = "printf", description = "Formats and prints arguments.")
public class PrintfAction extends AbstractAction {
@Argument(index = 0, name = "format", description = "The format pattern to use", required = true, multiValued = false)
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/SleepAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/SleepAction.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/SleepAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/SleepAction.java Wed Feb 2 15:43:13 2011
@@ -20,7 +20,7 @@ import org.apache.karaf.shell.console.Ab
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-@Command(scope = "shell", name = "sleep", description = "Sleeps for a bit then wakes up")
+@Command(scope = "shell", name = "sleep", description = "Sleeps for a bit then wakes up.")
public class SleepAction extends AbstractAction {
@Argument(index = 0, name = "duration", description = "The amount of millis to sleep", required = true, multiValued = false)
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/SortAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/SortAction.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/SortAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/SortAction.java Wed Feb 2 15:43:13 2011
@@ -44,7 +44,7 @@ import org.apache.karaf.shell.console.Ab
*
* @version $Rev: 722776 $ $Date: 2008-12-03 05:59:59 +0100 (Wed, 03 Dec 2008) $
*/
-@Command(scope = "shell", name = "sort", description = "Write sorted concatenation of all files to standard output.")
+@Command(scope = "shell", name = "sort", description = "Writes sorted concatenation of all files to standard output.")
public class SortAction extends AbstractAction {
@Option(name = "-f", aliases = { "-ignore-case" }, description = "fold lower case to upper case characters", required = false, multiValued = false)
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/TacAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/TacAction.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/TacAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/TacAction.java Wed Feb 2 15:43:13 2011
@@ -37,7 +37,7 @@ import org.apache.felix.gogo.commands.Op
*
* @version $Rev: 593392 $ $Date: 2007-11-09 03:14:15 +0100 (Fri, 09 Nov 2007) $
*/
-@Command(scope = "shell", name = "tac", description = "Captures the STDIN and returns it as a string. Optionally writes the content to a file")
+@Command(scope = "shell", name = "tac", description = "Captures the STDIN and returns it as a string. Optionally writes the content to a file.")
public class TacAction extends AbstractAction {
@Option(name = "-f", aliases = {}, description = "Outputs the content to the given file", required = false, multiValued = false)
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/TailAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/TailAction.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/TailAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/TailAction.java Wed Feb 2 15:43:13 2011
@@ -31,7 +31,7 @@ import org.apache.felix.gogo.commands.Co
import org.apache.felix.gogo.commands.Option;
import org.apache.karaf.shell.console.AbstractAction;
-@Command(scope = "shell", name = "tail", description = "Displays the last lines of a file")
+@Command(scope = "shell", name = "tail", description = "Displays the last lines of a file.")
public class TailAction extends AbstractAction {
private static final int DEFAULT_NUMBER_OF_LINES = 10;
Added: karaf/trunk/shell/commands/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/shell/commands/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/shell/commands/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 15:43:13 2011
@@ -0,0 +1,34 @@
+\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 various shell commands.
+
+ The following commands are available:
+ \u001B[36mshell:cat\u001B[0m Displays the content of a file or url.
+ \u001B[36mshell:clear\u001B[0m Clears the console buffer.
+ \u001B[36mshell:each\u001B[0m Execute a closure on a list of arguments.
+ \u001B[36mshell:echo\u001B[0m Echoes or prints arguments to STDOUT.
+ \u001B[36mshell:exec\u001B[0m Executes system processes.
+ \u001B[36mshell:grep\u001B[0m Prints lines matching the given pattern.
+ \u001B[36mshell:head\u001B[0m Displays the first lines of a file.
+ \u001B[36mshell:history\u001B[0m Prints command history.
+ \u001B[36mshell:if\u001B[0m If/Then/Else block.
+ \u001B[36mshell:info\u001B[0m Prints system information.
+ \u001B[36mshell:java\u001B[0m Executes a Java standard application.
+ \u001B[36mshell:logout\u001B[0m Disconnects shell from current session.
+ \u001B[36mshell:more\u001B[0m File pager.
+ \u001B[36mshell:new\u001B[0m Creates a new java object.
+ \u001B[36mshell:printf\u001B[0m Formats and prints arguments.
+ \u001B[36mshell:sleep\u001B[0m Sleeps for a bit then wakes up.
+ \u001B[36mshell:sort\u001B[0m Writes sorted concatenation of all files to standard output.
+ \u001B[36mshell:tac\u001B[0m Captures the STDIN and returns it as a string. Optionally writes the content to a file.
+ \u001B[36mshell:tail\u001B[0m Displays the last lines of a file.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mCommands\u001B[0m and \u001B[36mUsing the console\u001B[0m sections of the Karaf User Guide.
\ No newline at end of file
Modified: karaf/trunk/shell/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/config/pom.xml (original)
+++ karaf/trunk/shell/config/pom.xml Wed Feb 2 15:43:13 2011
@@ -30,10 +30,7 @@
<artifactId>org.apache.karaf.shell.config</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Shell :: ConfigAdmin Commands</name>
-
- <description>
- Provides the ConfigAdmin Shell commands.
- </description>
+ <description>This bundle provides Karaf shell commands to manipulate the ConfigAdmin service.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -68,6 +65,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/config/src/main/java/org/apache/karaf/shell/config/CancelCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/CancelCommand.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/CancelCommand.java (original)
+++ karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/CancelCommand.java Wed Feb 2 15:43:13 2011
@@ -19,7 +19,7 @@ package org.apache.karaf.shell.config;
import org.osgi.service.cm.ConfigurationAdmin;
import org.apache.felix.gogo.commands.Command;
-@Command(scope = "config", name = "cancel", description = "Cancel the changes to the configuration being edited.")
+@Command(scope = "config", name = "cancel", description = "Cancels the changes to the configuration being edited.")
public class CancelCommand extends ConfigCommandSupport {
protected void doExecute(ConfigurationAdmin admin) throws Exception {
Modified: karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/EditCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/EditCommand.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/EditCommand.java (original)
+++ karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/EditCommand.java Wed Feb 2 15:43:13 2011
@@ -24,7 +24,7 @@ import org.apache.felix.gogo.commands.Op
import org.apache.felix.gogo.commands.Command;
import org.osgi.service.cm.ConfigurationAdmin;
-@Command(scope = "config", name = "edit", description = "Create or edit a configuration.")
+@Command(scope = "config", name = "edit", description = "Creates or edits a configuration.")
public class EditCommand extends ConfigCommandSupport {
@Argument(index = 0, name = "pid", description = "PID of the configuration", required = true, multiValued = false)
Modified: karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java (original)
+++ karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java Wed Feb 2 15:43:13 2011
@@ -26,7 +26,7 @@ import org.osgi.service.cm.Configuration
import org.osgi.service.cm.ConfigurationAdmin;
import org.apache.felix.gogo.commands.Command;
-@Command(scope = "config", name = "update", description = "Save and propagate changes from the configuration being edited.")
+@Command(scope = "config", name = "update", description = "Saves and propagates changes from the configuration being edited.")
public class UpdateCommand extends ConfigCommandSupport {
@Option(name = "-b", aliases = { "--bypass-storage" }, multiValued = false, required = false, description = "Do not store the configuration in a properties file, but feed it directly to ConfigAdmin")
Added: karaf/trunk/shell/config/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/shell/config/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/shell/config/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 15:43:13 2011
@@ -0,0 +1,24 @@
+\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 ConfigAdmin OSGi service.
+
+ The following commands are available:
+ \u001B[36mconfig:cancel\u001B[0m Cancels the changes to the configuration being edited.
+ \u001B[36mconfig:edit\u001B[0m Creates or edits a configuration.
+ \u001B[36mconfig:list\u001B[0m Lists existing configurations.
+ \u001B[36mconfig:propappend\u001B[0m Appends the given value to an existing property or creates
+ the property with the specified name and value.
+ \u001B[36mconfig:propdel\u001B[0m Deletes a property from the edited configuration.
+ \u001B[36mconfig:proplist\u001B[0m Lists properties from the currently edited configuration.
+ \u001B[36mconfig:propset\u001B[0m Sets a property in the currently edited configuration.
+ \u001B[36mconfig:update\u001B[0m Saves and propagates changes from the configuration being edited.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mCommands\u001B[0m section of the Karaf User Guide.
\ No newline at end of file
Modified: karaf/trunk/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/console/pom.xml (original)
+++ karaf/trunk/shell/console/pom.xml Wed Feb 2 15:43:13 2011
@@ -30,10 +30,7 @@
<artifactId>org.apache.karaf.shell.console</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Shell :: Console</name>
-
- <description>
- Provides the OSGi Shell integration.
- </description>
+ <description>This bundle provides OSGi shell integration and console support.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -84,6 +81,13 @@
</includes>
</resource>
<resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.info</include>
+ </includes>
+ </resource>
+ <resource>
<directory>${project.basedir}/src/main/filtered-resources</directory>
<filtering>true</filtering>
<includes>
Added: karaf/trunk/shell/console/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/shell/console/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/shell/console/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 15:43:13 2011
@@ -0,0 +1,14 @@
+\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 the integration of Apache Felix Gogo, shell, and console.
+
+ It provides the default Karaf branding including the default welcome message.
+
+\u001B[1mSEE ALSO\u001B[0m
\ No newline at end of file
Modified: karaf/trunk/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/dev/pom.xml (original)
+++ karaf/trunk/shell/dev/pom.xml Wed Feb 2 15:43:13 2011
@@ -1,103 +1,119 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <!--
+ <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>shell</artifactId>
- <groupId>org.apache.karaf.shell</groupId>
- <version>2.1.99-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.apache.karaf.shell.dev</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Karaf :: Shell :: Development Commands</name>
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
- <dependencies>
- <dependency>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>shell</artifactId>
<groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.console</artifactId>
- </dependency>
+ <version>2.1.99-SNAPSHOT</version>
+ </parent>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.util</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-wrap</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.utils</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Embed-Dependency>pax-url-mvn</Embed-Dependency>
- <Import-Package>
- !${project.artifactId}*,
- org.apache.felix.service.command,
- org.apache.felix.gogo.commands,
- org.apache.karaf.shell.console,
- *
- </Import-Package>
- <Private-Package>
- org.apache.felix.utils.version,
- org.apache.karaf.util,
- org.ops4j.pax.url.mvn,
- !*
- </Private-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <artifactId>org.apache.karaf.shell.dev</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Karaf :: Shell :: Development Commands</name>
+ <description>This bundle provides Karaf shell commands aim to help the developer.</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.util</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-wrap</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-mvn</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </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>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>pax-url-mvn</Embed-Dependency>
+ <Import-Package>
+ !${project.artifactId}*,
+ org.apache.felix.service.command,
+ org.apache.felix.gogo.commands,
+ org.apache.karaf.shell.console,
+ *
+ </Import-Package>
+ <Private-Package>
+ org.apache.felix.utils.version,
+ org.apache.karaf.util,
+ org.ops4j.pax.url.mvn,
+ !*
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/DynamicImport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/DynamicImport.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/DynamicImport.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/DynamicImport.java Wed Feb 2 15:43:13 2011
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
* Command for enabling/disabling debug logging on a bundle and calculating the difference in
* wired imports.
*/
-@Command(scope = "dev", name = "dynamic-import", description = "Enable/disable dynamic-import for a given bundle")
+@Command(scope = "dev", name = "dynamic-import", description = "Enables/disables dynamic-import for a given bundle.")
public class DynamicImport extends AbstractBundleCommand {
private final Logger LOG = LoggerFactory.getLogger(DynamicImport.class);
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java Wed Feb 2 15:43:13 2011
@@ -30,8 +30,7 @@ import org.apache.karaf.util.Properties;
/**
* Command for enabling/disabling debug logging on the OSGi framework
*/
-@Command(scope = "dev", name = "framework",
- description = "OSGi Framework options")
+@Command(scope = "dev", name = "framework", description = "OSGi Framework options.")
public class FrameworkOptions extends OsgiCommandSupport {
private static final String KARAF_BASE = System.getProperty("karaf.base");
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/PrintStackTraces.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/PrintStackTraces.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/PrintStackTraces.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/PrintStackTraces.java Wed Feb 2 15:43:13 2011
@@ -30,8 +30,7 @@ import static java.lang.String.format;
* Command for showing the full tree of bundles that have been used to resolve
* a given bundle.
*/
-@Command(scope = "dev", name = "print-stack-traces",
- description = "Print the full stack trace in the console when the execution of a command throws an exception")
+@Command(scope = "dev", name = "print-stack-traces", description = "Prints the full stack trace in the console when the execution of a command throws an exception.")
public class PrintStackTraces extends OsgiCommandSupport {
private static final Logger LOGGER = LoggerFactory.getLogger(PrintStackTraces.class);
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/Restart.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/Restart.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/Restart.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/Restart.java Wed Feb 2 15:43:13 2011
@@ -23,8 +23,7 @@ import org.apache.karaf.shell.console.Os
/**
* A command to restart karaf
*/
-@Command(scope = "dev", name = "restart",
- description = "Restart Karaf")
+@Command(scope = "dev", name = "restart", description = "Restart Karaf.")
public class Restart extends OsgiCommandSupport {
@Option(name = "-c", aliases = { "--clean" }, description = "Force a clean restart by deleteting the working directory")
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/ShowBundleTree.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/ShowBundleTree.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/ShowBundleTree.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/ShowBundleTree.java Wed Feb 2 15:43:13 2011
@@ -42,8 +42,7 @@ import org.slf4j.LoggerFactory;
* Command for showing the full tree of bundles that have been used to resolve
* a given bundle.
*/
-@Command(scope = "dev", name = "show-tree",
- description = "Show the tree of bundles based on the wiring information")
+@Command(scope = "dev", name = "show-tree", description = "Shows the tree of bundles based on the wiring information.")
public class ShowBundleTree extends AbstractBundleCommand {
private static final Logger LOGGER = LoggerFactory.getLogger(ShowBundleTree.class);
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/Watch.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/Watch.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/Watch.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/Watch.java Wed Feb 2 15:43:13 2011
@@ -26,7 +26,7 @@ import org.apache.karaf.shell.dev.watch.
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
-@Command(scope = "dev", name = "watch", description = "Watch and Update bundles", detailedDescription="classpath:watch.txt")
+@Command(scope = "dev", name = "watch", description = "Watches and updates bundles.", detailedDescription="classpath:watch.txt")
public class Watch extends OsgiCommandSupport {
@Argument(index = 0, name = "urls", description = "The bundle URLs", required = false)
Added: karaf/trunk/shell/dev/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/resources/OSGI-INF/bundle.info?rev=1066500&view=auto
==============================================================================
--- karaf/trunk/shell/dev/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/shell/dev/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 15:43:13 2011
@@ -0,0 +1,24 @@
+\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 shell commands aim to help the developer.
+
+ The purpose is provide tooling to help the developer to identify eventually leaks or issues.
+
+ The following commands are available:
+ \u001B[36mdev:dynamic-import\u001B[0m Enables/disables dynamic-import for a given bundle.
+ \u001B[36mdev:framework\u001B[0m OSGi Framework options.
+ \u001B[36mdev:print-stack-traces\u001B[0m Prints the full stack trace in the console when the execution of a command
+ throws an exception.
+ \u001B[36mdev:restart\u001B[0m Restart Karaf.
+ \u001B[36mdev:show-tree\u001B[0m Shows the tree of bundles based on the wiring information.
+ \u001B[36mdev:watch\u001B[0m Watches and updates bundles.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mCommands\u001B[0m section of the Karaf User Guide.
\ No newline at end of file
Modified: karaf/trunk/shell/log/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/pom.xml?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/log/pom.xml (original)
+++ karaf/trunk/shell/log/pom.xml Wed Feb 2 15:43:13 2011
@@ -30,10 +30,7 @@
<artifactId>org.apache.karaf.shell.log</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Shell :: Log Commands</name>
-
- <description>
- Provides the OSGi Log commands.
- </description>
+ <description>This bundle provides Karaf shell commands to manipulate Log 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/log/src/main/java/org/apache/karaf/shell/log/DisplayException.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayException.java?rev=1066500&r1=1066499&r2=1066500&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayException.java (original)
+++ karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayException.java Wed Feb 2 15:43:13 2011
@@ -20,7 +20,7 @@ import org.ops4j.pax.logging.spi.PaxLogg
import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Command;
-@Command(scope = "log", name = "display-exception", description = "Displays the last occured exception from the log.")
+@Command(scope = "log", name = "display-exception", description = "Displays the last occurred exception from the log.")
public class DisplayException extends OsgiCommandSupport {
protected LruList events;