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/01 17:44:52 UTC

svn commit: r1066089 - in /karaf/trunk: admin/command/ admin/command/src/main/resources/OSGI-INF/ admin/core/ admin/core/src/main/resources/OSGI-INF/ admin/management/ admin/management/src/main/resources/OSGI-INF/ client/ client/src/main/resources/OSGI...

Author: jbonofre
Date: Tue Feb  1 16:44:51 2011
New Revision: 1066089

URL: http://svn.apache.org/viewvc?rev=1066089&view=rev
Log:
[KARAF-403] Begin to add OSGI-INF/bundle.info in all Karaf bundles.

Added:
    karaf/trunk/admin/command/src/main/resources/OSGI-INF/bundle.info
    karaf/trunk/admin/core/src/main/resources/OSGI-INF/bundle.info
    karaf/trunk/admin/management/src/main/resources/OSGI-INF/bundle.info
    karaf/trunk/client/src/main/resources/OSGI-INF/
    karaf/trunk/client/src/main/resources/OSGI-INF/bundle.info
    karaf/trunk/deployer/blueprint/src/main/resources/OSGI-INF/bundle.info
    karaf/trunk/deployer/features/src/main/resources/OSGI-INF/bundle.info
    karaf/trunk/deployer/kar/src/main/resources/OSGI-INF/bundle.info
    karaf/trunk/deployer/spring/src/main/resources/OSGI-INF/bundle.info
    karaf/trunk/deployer/wrap/src/main/resources/OSGI-INF/bundle.info
    karaf/trunk/diagnostic/command/src/main/resources/OSGI-INF/bundle.info
    karaf/trunk/diagnostic/common/src/main/resources/OSGI-INF/bundle.info
    karaf/trunk/diagnostic/core/src/main/resources/
    karaf/trunk/diagnostic/core/src/main/resources/OSGI-INF/
    karaf/trunk/diagnostic/core/src/main/resources/OSGI-INF/bundle.info
    karaf/trunk/diagnostic/management/src/main/resources/OSGI-INF/bundle.info
Modified:
    karaf/trunk/admin/command/pom.xml
    karaf/trunk/admin/core/pom.xml
    karaf/trunk/admin/management/pom.xml
    karaf/trunk/client/pom.xml
    karaf/trunk/deployer/blueprint/pom.xml
    karaf/trunk/deployer/features/pom.xml
    karaf/trunk/deployer/kar/pom.xml
    karaf/trunk/deployer/spring/pom.xml
    karaf/trunk/deployer/wrap/pom.xml
    karaf/trunk/diagnostic/command/pom.xml
    karaf/trunk/diagnostic/common/pom.xml
    karaf/trunk/diagnostic/core/pom.xml
    karaf/trunk/diagnostic/management/pom.xml

Modified: karaf/trunk/admin/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/command/pom.xml?rev=1066089&r1=1066088&r2=1066089&view=diff
==============================================================================
--- karaf/trunk/admin/command/pom.xml (original)
+++ karaf/trunk/admin/command/pom.xml Tue Feb  1 16:44:51 2011
@@ -30,6 +30,7 @@
     <artifactId>org.apache.karaf.admin.command</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Admin :: Command</name>
+    <description>Admin shell commands to manipulate Karaf child instances.</description>
 
     <properties>
         <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -74,6 +75,21 @@
      </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>${project.directory}/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/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=1066089&view=auto
==============================================================================
--- karaf/trunk/admin/command/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/admin/command/src/main/resources/OSGI-INF/bundle.info Tue Feb  1 16:44:51 2011
@@ -0,0 +1,25 @@
+\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 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
+
+\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/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/pom.xml?rev=1066089&r1=1066088&r2=1066089&view=diff
==============================================================================
--- karaf/trunk/admin/core/pom.xml (original)
+++ karaf/trunk/admin/core/pom.xml Tue Feb  1 16:44:51 2011
@@ -30,6 +30,7 @@
     <artifactId>org.apache.karaf.admin.core</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Admin :: Core</name>
+    <description>Core implementation of the admin feature to manipulate Karaf child instances.</description>
 
     <properties>
         <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -93,6 +94,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>

Added: karaf/trunk/admin/core/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/resources/OSGI-INF/bundle.info?rev=1066089&view=auto
==============================================================================
--- karaf/trunk/admin/core/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/admin/core/src/main/resources/OSGI-INF/bundle.info Tue Feb  1 16:44:51 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 admin feature.
+
+    Karaf admin allows you to manage Karaf child instances.
+
+    You can create new Karaf instances, configure attributes, rename instances, stop instances, etc.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[31mManaging child instances\u001B[0m of the Karaf User Guide.
\ No newline at end of file

Modified: karaf/trunk/admin/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/management/pom.xml?rev=1066089&r1=1066088&r2=1066089&view=diff
==============================================================================
--- karaf/trunk/admin/management/pom.xml (original)
+++ karaf/trunk/admin/management/pom.xml Tue Feb  1 16:44:51 2011
@@ -30,6 +30,7 @@
     <artifactId>org.apache.karaf.admin.management</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Admin :: Management</name>
+    <description>Provide JMX MBeans related to the Karaf admin feature.</description>
 
     <properties>
         <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -68,6 +69,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/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=1066089&view=auto
==============================================================================
--- karaf/trunk/admin/management/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/admin/management/src/main/resources/OSGI-INF/bundle.info Tue Feb  1 16:44:51 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 JMX MBeans related to the Karaf admin feature.
+
+    Especially, you have a AdminServiceMBean that you can manipulate remotely using a JMX client (for instance
+    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[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/client/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/client/pom.xml?rev=1066089&r1=1066088&r2=1066089&view=diff
==============================================================================
--- karaf/trunk/client/pom.xml (original)
+++ karaf/trunk/client/pom.xml Tue Feb  1 16:44:51 2011
@@ -30,6 +30,7 @@
     <artifactId>org.apache.karaf.client</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Client</name>
+    <description>Karaf client to connect remotely to a running Karaf instance.</description>
 
     <properties>
         <appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
@@ -53,7 +54,14 @@
             <artifactId>slf4j-simple</artifactId>
         </dependency>
     </dependencies>
+
     <build>
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
@@ -116,12 +124,6 @@
                 </executions>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
     </build>
     
 

Added: karaf/trunk/client/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/client/src/main/resources/OSGI-INF/bundle.info?rev=1066089&view=auto
==============================================================================
--- karaf/trunk/client/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/client/src/main/resources/OSGI-INF/bundle.info Tue Feb  1 16:44:51 2011
@@ -0,0 +1,27 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.name}
+
+    ${project.description}
+
+    Maven URL:
+        \u001B[33mmvn:${project.groupId}/${project.artifactId}/${project.version}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    The Karaf client allows you to connect remotely to a running Karaf instance.
+
+    It acts as a SSH client and send commands to the running Karaf instance. If no commands are provided, the Karaf
+    client display the Karaf instance shell on which you can interact.
+
+    To start the Karaf client, you can use the following arguments:
+        \u001B[36m-a [port]     specify the port to connect to\u001B[0m
+        \u001B[36m-h [host]     specify the host to connect to\u001B[0m
+        \u001B[36m-u [user]     specify the user name\u001B[0m
+        \u001B[36m-p [password] specify the password\u001B[0m
+        \u001B[36m--help        show help\u001B[0m
+        \u001B[36m-v            raise verbosity\u001B[0m
+        \u001B[36m-r [attempts] retry connection establishment (up to attempts time)\u001B[0m
+        \u001B[36m-d [delay]    intra-retry delay (default is 2 secondes)\u001B[0m
+        \u001B[36m[commands]    commands to run\u001B[0m
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[31mUsing remote instances\u001B[0m section of the Karaf User Guide.
\ No newline at end of file

Modified: karaf/trunk/deployer/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/blueprint/pom.xml?rev=1066089&r1=1066088&r2=1066089&view=diff
==============================================================================
--- karaf/trunk/deployer/blueprint/pom.xml (original)
+++ karaf/trunk/deployer/blueprint/pom.xml Tue Feb  1 16:44:51 2011
@@ -70,6 +70,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/deployer/blueprint/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/blueprint/src/main/resources/OSGI-INF/bundle.info?rev=1066089&view=auto
==============================================================================
--- karaf/trunk/deployer/blueprint/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/deployer/blueprint/src/main/resources/OSGI-INF/bundle.info Tue Feb  1 16:44:51 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
+    The blueprint deployer allows you to drop Blueprint XML file directory in the deploy directory.
+
+    Karaf will load the Blueprint descriptor and transforms it into a deployable bundle.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[31mDeployer\u001B[0m section of the Karaf User Guide.
\ No newline at end of file

Modified: karaf/trunk/deployer/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/features/pom.xml?rev=1066089&r1=1066088&r2=1066089&view=diff
==============================================================================
--- karaf/trunk/deployer/features/pom.xml (original)
+++ karaf/trunk/deployer/features/pom.xml Tue Feb  1 16:44:51 2011
@@ -74,6 +74,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/deployer/features/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/features/src/main/resources/OSGI-INF/bundle.info?rev=1066089&view=auto
==============================================================================
--- karaf/trunk/deployer/features/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/deployer/features/src/main/resources/OSGI-INF/bundle.info Tue Feb  1 16:44:51 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
+    The features deployer allow you to drop directly a XML features descriptor in the Karaf deploy directory.
+
+    Karaf will resolve and deploy all features and bundles contained in this features descriptor.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[31mDeployer\u001B[0m section of the Karaf User Guide.
\ No newline at end of file

Modified: karaf/trunk/deployer/kar/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/kar/pom.xml?rev=1066089&r1=1066088&r2=1066089&view=diff
==============================================================================
--- karaf/trunk/deployer/kar/pom.xml (original)
+++ karaf/trunk/deployer/kar/pom.xml Tue Feb  1 16:44:51 2011
@@ -78,6 +78,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/deployer/kar/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/kar/src/main/resources/OSGI-INF/bundle.info?rev=1066089&view=auto
==============================================================================
--- karaf/trunk/deployer/kar/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/deployer/kar/src/main/resources/OSGI-INF/bundle.info Tue Feb  1 16:44:51 2011
@@ -0,0 +1,16 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.name}
+
+    ${project.description}
+
+    Maven URL:
+        \u001B[33mmvn:${project.groupId}/${project.artifactId}/${project.version}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    The Karaf KAR is an archive (similar to JAR) containing a set of bundles jar files and features descriptors.
+
+    Karaf deployer explodes the KAR archive and deploy the features descriptors and bundles.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mDeployer\u001B[0m section of the Karaf User Guide.
+    \u001B[36mKAR\u001B[0m section of the Karaf User Guide.
\ No newline at end of file

Modified: karaf/trunk/deployer/spring/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/spring/pom.xml?rev=1066089&r1=1066088&r2=1066089&view=diff
==============================================================================
--- karaf/trunk/deployer/spring/pom.xml (original)
+++ karaf/trunk/deployer/spring/pom.xml Tue Feb  1 16:44:51 2011
@@ -70,6 +70,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/deployer/spring/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/spring/src/main/resources/OSGI-INF/bundle.info?rev=1066089&view=auto
==============================================================================
--- karaf/trunk/deployer/spring/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/deployer/spring/src/main/resources/OSGI-INF/bundle.info Tue Feb  1 16:44:51 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
+    The spring deployer allows you to drop Spring file directly in the Karaf deploy directory.
+
+    Karaf supports "classic" Spring or spring-dm configuration files.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mDeployer\u001B[0m section of the Karaf User Guide.
\ No newline at end of file

Modified: karaf/trunk/deployer/wrap/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/wrap/pom.xml?rev=1066089&r1=1066088&r2=1066089&view=diff
==============================================================================
--- karaf/trunk/deployer/wrap/pom.xml (original)
+++ karaf/trunk/deployer/wrap/pom.xml Tue Feb  1 16:44:51 2011
@@ -31,7 +31,7 @@
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Deployer :: Wrap Non OSGi Jar</name>
 
-    <description>This deployer transforms non OSGi jar files to a deployable bundle</description>
+    <description>This deployer transforms non OSGi jar files to a deployable bundle.</description>
 
     <properties>
         <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -60,6 +60,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/deployer/wrap/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/wrap/src/main/resources/OSGI-INF/bundle.info?rev=1066089&view=auto
==============================================================================
--- karaf/trunk/deployer/wrap/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/deployer/wrap/src/main/resources/OSGI-INF/bundle.info Tue Feb  1 16:44:51 2011
@@ -0,0 +1,16 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.name}
+
+    ${project.description}
+
+    Maven URL:
+        \u001B[33mmvn:${project.groupId}/${project.artifactId}/${project.version}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    The wrap deployer allows you to drop non-OSGi jar files into the Karaf deploy directory.
+
+    Karaf will transform the jar files into a deployable OSGi bundle, including creation of the Export-Package and
+    Import-Package statement.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mDeployer\u001B[0m section of the Karaf User Guide.
\ No newline at end of file

Modified: karaf/trunk/diagnostic/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/command/pom.xml?rev=1066089&r1=1066088&r2=1066089&view=diff
==============================================================================
--- karaf/trunk/diagnostic/command/pom.xml (original)
+++ karaf/trunk/diagnostic/command/pom.xml Tue Feb  1 16:44:51 2011
@@ -30,6 +30,7 @@
     <artifactId>org.apache.karaf.diagnostic.command</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Diagnostic :: Command</name>
+    <description>This bundle provides Karaf diagnostic shell commands.</description>
 
     <properties>
         <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -58,6 +59,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/diagnostic/command/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/command/src/main/resources/OSGI-INF/bundle.info?rev=1066089&view=auto
==============================================================================
--- karaf/trunk/diagnostic/command/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/diagnostic/command/src/main/resources/OSGI-INF/bundle.info Tue Feb  1 16:44:51 2011
@@ -0,0 +1,16 @@
+\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 for the Karaf diagnostic.
+
+    The current provided command is:
+    - \u001B[36mdev:create-dump\u001B[0m
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mDiagnostic\u001B[0m section of the Karaf User Guide.
\ No newline at end of file

Modified: karaf/trunk/diagnostic/common/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/common/pom.xml?rev=1066089&r1=1066088&r2=1066089&view=diff
==============================================================================
--- karaf/trunk/diagnostic/common/pom.xml (original)
+++ karaf/trunk/diagnostic/common/pom.xml Tue Feb  1 16:44:51 2011
@@ -30,6 +30,7 @@
     <artifactId>org.apache.karaf.diagnostic.common</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Diagnostic :: Common</name>
+    <description>Common provider for the Karaf diagnostic.</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/diagnostic/common/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/common/src/main/resources/OSGI-INF/bundle.info?rev=1066089&view=auto
==============================================================================
--- karaf/trunk/diagnostic/common/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/diagnostic/common/src/main/resources/OSGI-INF/bundle.info Tue Feb  1 16:44:51 2011
@@ -0,0 +1,19 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.name}
+
+    ${project.description}
+
+    Maven URL:
+        \u001B[33mmvn:${project.groupId}/${project.artifactId}/${project.version}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    The diagnostic common bundle provides diagnostic services.
+
+    The diagnostic services cover dump on:
+    - features
+    - logs
+    - bundles
+    - threads
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mDiagnostic\u001B[0m section of the Karaf User Guide.
\ No newline at end of file

Modified: karaf/trunk/diagnostic/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/core/pom.xml?rev=1066089&r1=1066088&r2=1066089&view=diff
==============================================================================
--- karaf/trunk/diagnostic/core/pom.xml (original)
+++ karaf/trunk/diagnostic/core/pom.xml Tue Feb  1 16:44:51 2011
@@ -30,12 +30,28 @@
     <artifactId>org.apache.karaf.diagnostic.core</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Diagnostic :: Core</name>
+    <description>Core implementation using Karaf diagnostic using the diagnostic common services</description>
 
     <properties>
         <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
     </properties>
 
     <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/diagnostic/core/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/core/src/main/resources/OSGI-INF/bundle.info?rev=1066089&view=auto
==============================================================================
--- karaf/trunk/diagnostic/core/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/diagnostic/core/src/main/resources/OSGI-INF/bundle.info Tue Feb  1 16:44:51 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
+    The diagnostic core bundle is the diagnostic core implementation.
+
+    It's used by the diagnostic commands bundle and is responsible of the dump generation (features, logs, bundles, threads).
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mDiagnostic\u001B[0m section of the Karaf User Guide.
\ No newline at end of file

Modified: karaf/trunk/diagnostic/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/management/pom.xml?rev=1066089&r1=1066088&r2=1066089&view=diff
==============================================================================
--- karaf/trunk/diagnostic/management/pom.xml (original)
+++ karaf/trunk/diagnostic/management/pom.xml Tue Feb  1 16:44:51 2011
@@ -30,6 +30,7 @@
     <artifactId>org.apache.karaf.diagnostic.management</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Karaf :: Diagnostic :: Management</name>
+    <description>Expose diagnostic MBeans via JMX.</description>
 
     <properties>
         <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -57,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/diagnostic/management/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/management/src/main/resources/OSGI-INF/bundle.info?rev=1066089&view=auto
==============================================================================
--- karaf/trunk/diagnostic/management/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/diagnostic/management/src/main/resources/OSGI-INF/bundle.info Tue Feb  1 16:44:51 2011
@@ -0,0 +1,16 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.name}
+
+    ${project.description}
+
+    Maven URL:
+        \u001B[33mmvn:${project.groupId}/${project.artifactId}/${project.version}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    The diagnostic management bundle exposes Diagnostic MBeans that you can use with any JMX client (for instance JConsole).
+
+    The DiagnosticDumpMBean is available and exposes the following operation:
+    \u001B[36mcreateDump()\u001B[0m
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mDiagnostic\u001B[0m and \u001B[36mRemote Management via JMX\u001B[0m for the Karaf User Guide.
\ No newline at end of file