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 22:27:47 UTC
svn commit: r1066632 - in /karaf/trunk: main/ shell/osgi/
shell/osgi/src/main/java/org/apache/karaf/shell/osgi/
shell/osgi/src/main/resources/OSGI-INF/ shell/packages/
shell/packages/src/main/java/org/apache/karaf/shell/packages/
shell/packages/src/mai...
Author: jbonofre
Date: Wed Feb 2 21:27:45 2011
New Revision: 1066632
URL: http://svn.apache.org/viewvc?rev=1066632&view=rev
Log:
[KARAF-403] Complete adding OSGI-INF/bundle.info in all Karaf bundles.
Added:
karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/shell/packages/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/shell/web/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/webconsole/branding/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/webconsole/console/src/main/resources/
karaf/trunk/webconsole/console/src/main/resources/OSGI-INF/
karaf/trunk/webconsole/console/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/webconsole/features/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/webconsole/gogo/src/main/resources/OSGI-INF/bundle.info
Modified:
karaf/trunk/main/pom.xml
karaf/trunk/shell/osgi/pom.xml
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundleLevel.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Headers.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Info.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/InstallBundle.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ListBundles.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ListServices.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/RefreshBundle.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ResolveBundle.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/RestartBundle.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/StartBundle.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/StartLevel.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/StopBundle.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/UninstallBundle.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/UpdateBundle.java
karaf/trunk/shell/packages/pom.xml
karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/ExportsCommand.java
karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/ImportsCommand.java
karaf/trunk/shell/ssh/pom.xml
karaf/trunk/shell/web/pom.xml
karaf/trunk/shell/web/src/main/java/org/apache/karaf/shell/web/WebListCommand.java
karaf/trunk/shell/wrapper/pom.xml
karaf/trunk/webconsole/admin/pom.xml
karaf/trunk/webconsole/branding/pom.xml
karaf/trunk/webconsole/console/pom.xml
karaf/trunk/webconsole/features/pom.xml
karaf/trunk/webconsole/gogo/pom.xml
Modified: karaf/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/main/pom.xml?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/main/pom.xml (original)
+++ karaf/trunk/main/pom.xml Wed Feb 2 21:27:45 2011
@@ -70,15 +70,9 @@
<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>
+ <include>**/*</include>
</includes>
</resource>
</resources>
@@ -153,12 +147,6 @@
</plugin>
-->
</plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
</build>
<profiles>
Modified: karaf/trunk/shell/osgi/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/pom.xml?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/pom.xml (original)
+++ karaf/trunk/shell/osgi/pom.xml Wed Feb 2 21:27:45 2011
@@ -30,10 +30,7 @@
<artifactId>org.apache.karaf.shell.osgi</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Shell :: OSGi Commands</name>
-
- <description>
- Provides the OSGi Shell commands.
- </description>
+ <description>This bundle provides the low level OSGi Karaf shell commands.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -77,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>
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundleLevel.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundleLevel.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundleLevel.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundleLevel.java Wed Feb 2 21:27:45 2011
@@ -22,7 +22,7 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.service.startlevel.StartLevel;
-@Command(scope = "osgi", name = "bundle-level", description = "Get or set the start level of a given bundle")
+@Command(scope = "osgi", name = "bundle-level", description = "Gets or sets the start level of a given bundle.")
public class BundleLevel extends BundleCommand {
@Argument(index = 1, name = "startLevel", description = "The bundles new start level", required = false, multiValued = false)
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Headers.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Headers.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Headers.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Headers.java Wed Feb 2 21:27:45 2011
@@ -41,7 +41,7 @@ import org.osgi.framework.ServiceReferen
import org.osgi.service.packageadmin.ExportedPackage;
import org.osgi.service.packageadmin.PackageAdmin;
-@Command(scope = "osgi", name = "headers", description = "Displays OSGi headers of a given bundle")
+@Command(scope = "osgi", name = "headers", description = "Displays OSGi headers of a given bundle.")
public class Headers extends OsgiCommandSupport {
protected final static String BUNDLE_PREFIX = "Bundle-";
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Info.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Info.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Info.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Info.java Wed Feb 2 21:27:45 2011
@@ -27,7 +27,7 @@ import java.io.InputStreamReader;
import java.net.URL;
import java.util.List;
-@Command(scope = "osgi", name = "info", description = "Displays detailed information of a given bundle")
+@Command(scope = "osgi", name = "info", description = "Displays detailed information of a given bundle.")
public class Info extends OsgiCommandSupport {
@Argument(index = 0, name = "ids", description = "A list of bundle IDs separated by whitespaces", required = false, multiValued = true)
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/InstallBundle.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/InstallBundle.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/InstallBundle.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/InstallBundle.java Wed Feb 2 21:27:45 2011
@@ -27,7 +27,7 @@ import org.apache.felix.gogo.commands.Co
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
-@Command(scope = "osgi", name = "install", description = "Installs one or more bundles")
+@Command(scope = "osgi", name = "install", description = "Installs one or more bundles.")
public class InstallBundle extends OsgiCommandSupport {
@Argument(index = 0, name = "urls", description = "Bundle URLs separated by whitespaces", required = true, multiValued = true)
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ListBundles.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ListBundles.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ListBundles.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ListBundles.java Wed Feb 2 21:27:45 2011
@@ -27,7 +27,7 @@ import org.osgi.framework.ServiceReferen
import org.osgi.service.packageadmin.PackageAdmin;
import org.osgi.service.startlevel.StartLevel;
-@Command(scope = "osgi", name = "list", description = "Lists all installed bundles")
+@Command(scope = "osgi", name = "list", description = "Lists all installed bundles.")
public class ListBundles extends OsgiCommandSupport {
@Option(name = "-l", aliases = {}, description = "Show the locations", required = false, multiValued = false)
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ListServices.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ListServices.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ListServices.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ListServices.java Wed Feb 2 21:27:45 2011
@@ -26,7 +26,7 @@ import org.apache.felix.gogo.commands.Co
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
-@Command(scope = "osgi", name = "ls", description = "Lists OSGi services")
+@Command(scope = "osgi", name = "ls", description = "Lists OSGi services.")
public class ListServices extends OsgiCommandSupport {
@Option(name = "-a", aliases = {}, description = "Shows all services", required = false, multiValued = false)
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/RefreshBundle.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/RefreshBundle.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/RefreshBundle.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/RefreshBundle.java Wed Feb 2 21:27:45 2011
@@ -25,7 +25,7 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.service.packageadmin.PackageAdmin;
-@Command(scope = "osgi", name = "refresh", description = "Refresh a bundle")
+@Command(scope = "osgi", name = "refresh", description = "Refresh a bundle.")
public class RefreshBundle extends BundlesCommandOptional {
protected void doExecute(List<Bundle> bundles) throws Exception {
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ResolveBundle.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ResolveBundle.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ResolveBundle.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ResolveBundle.java Wed Feb 2 21:27:45 2011
@@ -23,7 +23,7 @@ import org.osgi.framework.ServiceReferen
import org.osgi.service.packageadmin.PackageAdmin;
import org.apache.felix.gogo.commands.Command;
-@Command(scope = "osgi", name = "resolve", description = "Resolve bundle(s)")
+@Command(scope = "osgi", name = "resolve", description = "Resolve bundle(s).")
public class ResolveBundle extends BundlesCommandOptional {
protected void doExecute(List<Bundle> bundles) throws Exception {
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/RestartBundle.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/RestartBundle.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/RestartBundle.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/RestartBundle.java Wed Feb 2 21:27:45 2011
@@ -21,7 +21,7 @@ import java.util.List;
import org.osgi.framework.Bundle;
import org.apache.felix.gogo.commands.Command;
-@Command(scope = "osgi", name = "restart", description = "Stop and restart bundle(s)")
+@Command(scope = "osgi", name = "restart", description = "Stops and restarts bundle(s).")
public class RestartBundle extends BundlesCommand {
protected void doExecute(List<Bundle> bundles) throws Exception {
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java Wed Feb 2 21:27:45 2011
@@ -23,7 +23,7 @@ import org.osgi.framework.Bundle;
/**
* Command to shut down Karaf
*/
-@Command(scope = "osgi", name = "shutdown", description = "Shuts the framework down")
+@Command(scope = "osgi", name = "shutdown", description = "Shuts the framework down.")
public class Shutdown extends OsgiCommandSupport {
protected Object doExecute() throws Exception {
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/StartBundle.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/StartBundle.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/StartBundle.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/StartBundle.java Wed Feb 2 21:27:45 2011
@@ -21,7 +21,7 @@ import java.util.List;
import org.osgi.framework.Bundle;
import org.apache.felix.gogo.commands.Command;
-@Command(scope = "osgi", name = "start", description = "Start bundle(s)")
+@Command(scope = "osgi", name = "start", description = "Starts bundle(s).")
public class StartBundle extends BundlesCommand {
protected void doExecute(List<Bundle> bundles) throws Exception {
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/StartLevel.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/StartLevel.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/StartLevel.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/StartLevel.java Wed Feb 2 21:27:45 2011
@@ -21,7 +21,7 @@ import org.apache.felix.gogo.commands.Ar
import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.ServiceReference;
-@Command(scope = "osgi", name = "start-level", description = "Get or set the system start level")
+@Command(scope = "osgi", name = "start-level", description = "Gets or sets the system start level.")
public class StartLevel extends OsgiCommandSupport {
@Argument(index = 0, name = "level", description = "The new system start level to set", required = false, multiValued = false)
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/StopBundle.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/StopBundle.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/StopBundle.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/StopBundle.java Wed Feb 2 21:27:45 2011
@@ -21,7 +21,7 @@ import java.util.List;
import org.osgi.framework.Bundle;
import org.apache.felix.gogo.commands.Command;
-@Command(scope = "osgi", name = "stop", description = "Stop bundle(s)")
+@Command(scope = "osgi", name = "stop", description = "Stop bundle(s).")
public class StopBundle extends BundlesCommand {
protected void doExecute(List<Bundle> bundles) throws Exception {
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/UninstallBundle.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/UninstallBundle.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/UninstallBundle.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/UninstallBundle.java Wed Feb 2 21:27:45 2011
@@ -21,7 +21,7 @@ import java.util.List;
import org.osgi.framework.Bundle;
import org.apache.felix.gogo.commands.Command;
-@Command(scope = "osgi", name = "uninstall", description = "Uninstall bundle(s)")
+@Command(scope = "osgi", name = "uninstall", description = "Uninstall bundle(s).")
public class UninstallBundle extends BundlesCommand {
protected void doExecute(List<Bundle> bundles) throws Exception {
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/UpdateBundle.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/UpdateBundle.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/UpdateBundle.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/UpdateBundle.java Wed Feb 2 21:27:45 2011
@@ -23,7 +23,7 @@ import org.apache.felix.gogo.commands.Ar
import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.Bundle;
-@Command(scope = "osgi", name = "update", description = "Update bundle")
+@Command(scope = "osgi", name = "update", description = "Update bundle.")
public class UpdateBundle extends BundleCommand {
@Argument(index = 1, name = "location", description = "The bundles update location", required = false, multiValued = false)
Added: karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/bundle.info?rev=1066632&view=auto
==============================================================================
--- karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 21:27:45 2011
@@ -0,0 +1,30 @@
+\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 low level OSGi shell commands.
+
+ The following commands are available:
+ \u001B[36mosgi:bundle-level\u001B[0m Gets or sets the start level of a given bundle.
+ \u001B[36mosgi:headers\u001B[0m Displays OSGi headers of a given bundle.
+ \u001B[36mosgi:info\u001B[0m Displays detailed information of a given bundle.
+ \u001B[36mosgi:installs\u001B[0m Installs one or more bundles.
+ \u001B[36mosgi:list\u001B[0m Lists all installed bundles.
+ \u001B[36mosgi:ls\u001B[0m Lists OSGi services.
+ \u001B[36mosgi:refresh\u001B[0m Refresh a bundle.
+ \u001B[36mosgi:resolve\u001B[0m Resolve bundle(s).
+ \u001B[36mosgi:restart\u001B[0m Stops and restarts bundle(s).
+ \u001B[36mosgi:shutdown\u001B[0m Shuts the framework down.
+ \u001B[36mosgi:start\u001B[0m Starts bundle(s).
+ \u001B[36mosgi:start-level\u001B[0m Gets or sets the system start level.
+ \u001B[36mosgi:stop\u001B[0m Stop bundle(s).
+ \u001B[36mosgi:uninstall\u001B[0m Uninstall bundle(s).
+ \u001B[36mosgi:update\u001B[0m Update bundle.
+
+\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/packages/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/packages/pom.xml?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/packages/pom.xml (original)
+++ karaf/trunk/shell/packages/pom.xml Wed Feb 2 21:27:45 2011
@@ -30,10 +30,7 @@
<artifactId>org.apache.karaf.shell.packages</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Shell :: PackageAdmin Commands</name>
-
- <description>
- Provides the PackageAdmin Shell commands.
- </description>
+ <description>This bundle provides Karaf shell commands to manipulate the PackageAdmin service.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -59,6 +56,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/packages/src/main/java/org/apache/karaf/shell/packages/ExportsCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/ExportsCommand.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/ExportsCommand.java (original)
+++ karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/ExportsCommand.java Wed Feb 2 21:27:45 2011
@@ -28,7 +28,7 @@ import org.osgi.framework.Constants;
import org.osgi.service.packageadmin.ExportedPackage;
import org.osgi.service.packageadmin.PackageAdmin;
-@Command(scope = "packages", name = "exports", description = "Display exported packages")
+@Command(scope = "packages", name = "exports", description = "Displays exported packages.")
public class ExportsCommand extends PackageCommandSupport {
@Option(name = "-i", aliases = {"--imports"}, description = "List bundles importing the specified packages")
Modified: karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/ImportsCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/ImportsCommand.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/ImportsCommand.java (original)
+++ karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/ImportsCommand.java Wed Feb 2 21:27:45 2011
@@ -30,7 +30,7 @@ import org.apache.felix.gogo.commands.Ar
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.Option;
-@Command(scope = "packages", name = "imports", description = "Display imported packages")
+@Command(scope = "packages", name = "imports", description = "Displays imported packages.")
public class ImportsCommand extends PackageCommandSupport {
@Argument(index = 0, name = "ids", description = "The IDs of bundles to check", required = false, multiValued = true)
Added: karaf/trunk/shell/packages/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/packages/src/main/resources/OSGI-INF/bundle.info?rev=1066632&view=auto
==============================================================================
--- karaf/trunk/shell/packages/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/shell/packages/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 21:27:45 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
+ This bundle provides Karaf shell commands to manipulate the PackageAdmin service.
+
+ It allows you to get the export/import packages present in the OSGi framework.
+
+ The following commands are available:
+ \u001B[36mpackages:exports\u001B[0m Displays exported packages.
+ \u001B[36mpackages:imports\u001B[0m Displays imported packages.
+
+\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/ssh/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/pom.xml?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/pom.xml (original)
+++ karaf/trunk/shell/ssh/pom.xml Wed Feb 2 21:27:45 2011
@@ -30,10 +30,7 @@
<artifactId>org.apache.karaf.shell.ssh</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Shell :: SSH</name>
-
- <description>
- Provides SSH support to the console.
- </description>
+ <description>This bundle provides SSH support to the Karaf console.</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>
Added: karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/bundle.info?rev=1066632&view=auto
==============================================================================
--- karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 21:27:45 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 SSH support for the Karaf shell console.
+
+ It acts as SSH client and server allowing you to receive SSH connection and be able to
+ connect to a remote SSH server.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mUsing remote instances\u001B[0m section of the Karaf User Guide.
\ No newline at end of file
Modified: karaf/trunk/shell/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/web/pom.xml?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/web/pom.xml (original)
+++ karaf/trunk/shell/web/pom.xml Wed Feb 2 21:27:45 2011
@@ -1,26 +1,25 @@
<?xml version="1.0"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>shell</artifactId>
- <groupId>org.apache.karaf.shell</groupId>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <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.web</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Karaf :: Shell :: Web Commands</name>
<version>2.1.99-SNAPSHOT</version>
- </parent>
+ <description>This bundle provides Karaf shell commands to manipulate web application bundles.</description>
- <artifactId>org.apache.karaf.shell.web</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Karaf :: Shell :: Web Commands</name>
- <version>2.1.99-SNAPSHOT</version>
- <description>Provides the web Shell commands.</description>
-
- <properties>
- <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
- </properties>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
@@ -37,12 +36,28 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-spi</artifactId>
- <scope>provided</scope>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-spi</artifactId>
+ <scope>provided</scope>
</dependency>
- </dependencies>
+ </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/web/src/main/java/org/apache/karaf/shell/web/WebListCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/web/src/main/java/org/apache/karaf/shell/web/WebListCommand.java?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/web/src/main/java/org/apache/karaf/shell/web/WebListCommand.java (original)
+++ karaf/trunk/shell/web/src/main/java/org/apache/karaf/shell/web/WebListCommand.java Wed Feb 2 21:27:45 2011
@@ -26,7 +26,7 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.service.startlevel.StartLevel;
-@Command(scope = "web", name = "list", description = "Lists details for war bundles")
+@Command(scope = "web", name = "list", description = "Lists details for war bundles.")
public class WebListCommand extends OsgiCommandSupport {
private StartLevel startLevelService;
Added: karaf/trunk/shell/web/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/web/src/main/resources/OSGI-INF/bundle.info?rev=1066632&view=auto
==============================================================================
--- karaf/trunk/shell/web/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/shell/web/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 21:27:45 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 Karaf shell commands to manipulate web application (war) bundles.
+
+ The following commands are available:
+ \u001B[36mweb:list\u001B[0m Lists details for war bundles.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mDeployer\u001B[0m section of the Karaf User Guide.
\ No newline at end of file
Modified: karaf/trunk/shell/wrapper/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/pom.xml?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/shell/wrapper/pom.xml (original)
+++ karaf/trunk/shell/wrapper/pom.xml Wed Feb 2 21:27:45 2011
@@ -30,10 +30,7 @@
<artifactId>org.apache.karaf.shell.wrapper</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Shell :: Service Wrapper</name>
-
- <description>
- Provides the Service Wrapper Shell integration.
- </description>
+ <description>This bundle provides support of service wrapper.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -72,6 +69,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/wrapper/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/bundle.info?rev=1066632&view=auto
==============================================================================
--- karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 21:27:45 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 support of the service wrapper.
+
+ The service wrapper allows you to start/stop Karaf as a system service.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mService Wrapper\u001B[0m section of the Karaf User Guide.
\ No newline at end of file
Modified: karaf/trunk/webconsole/admin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/admin/pom.xml?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/webconsole/admin/pom.xml (original)
+++ karaf/trunk/webconsole/admin/pom.xml Wed Feb 2 21:27:45 2011
@@ -20,7 +20,7 @@
-->
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
@@ -30,7 +30,8 @@
<artifactId>org.apache.karaf.webconsole.admin</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Web Console :: Admin Plugin</name>
-
+ <description>This bundle provides Karaf admin support in the Web Console.</description>
+
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
</properties>
@@ -69,7 +70,7 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
-
+
<!-- Only needed while running the unit tests -->
<dependency>
<groupId>commons-fileupload</groupId>
@@ -78,24 +79,39 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>!${project.artifactId}*,*</Import-Package>
- <Embed-Dependency>
- <!-- Required for JSON data transfer -->
- <!-- TODO: this needs to be put in a common place for reuse. -->
- json
- </Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </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>
+ <Import-Package>!${project.artifactId}*,*</Import-Package>
+ <Embed-Dependency>
+ <!-- Required for JSON data transfer -->
+ <!-- TODO: this needs to be put in a common place for reuse. -->
+ json
+ </Embed-Dependency>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Added: karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/bundle.info?rev=1066632&view=auto
==============================================================================
--- karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 21:27:45 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 usage of admin commands (to manipulate Karaf instances) in the
+ Karaf Web Console.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mWeb console\u001B[0m section in the Karaf User Guide.
\ No newline at end of file
Modified: karaf/trunk/webconsole/branding/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/branding/pom.xml?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/webconsole/branding/pom.xml (original)
+++ karaf/trunk/webconsole/branding/pom.xml Wed Feb 2 21:27:45 2011
@@ -30,11 +30,7 @@
<artifactId>org.apache.karaf.webconsole.branding</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Web Console :: Branding</name>
-
- <description>Apache Karaf branding for the Apache Felix Web Console. This fragment
- attaches to the org.apache.felix.webconsole bundle to provide branding
- through the /META-INF/webconsole.properties.
- </description>
+ <description>This bundle provides Karaf branding for the Felix web console.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -58,6 +54,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>
@@ -76,5 +87,4 @@
</plugins>
</build>
-
</project>
Added: karaf/trunk/webconsole/branding/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/branding/src/main/resources/OSGI-INF/bundle.info?rev=1066632&view=auto
==============================================================================
--- karaf/trunk/webconsole/branding/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/webconsole/branding/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 21:27:45 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
+ Apache Karaf branding for the Apache Felix Web Console. This fragment attaches to the
+ org.apache.felix.webconsole bundle to provide branding through the
+ /META-INF/webconsole.properties.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mWeb console\u001B[0m section in the Karaf User Guide.
\ No newline at end of file
Modified: karaf/trunk/webconsole/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/console/pom.xml?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/webconsole/console/pom.xml (original)
+++ karaf/trunk/webconsole/console/pom.xml Wed Feb 2 21:27:45 2011
@@ -30,9 +30,8 @@
<artifactId>org.apache.karaf.webconsole.console</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Web Console :: Console</name>
-
- <description>Apache Felix webconsole rebundled with small security related changes.
- </description>
+ <description>This bundle is a repackaging of the Felix Web console with small security
+ related changed.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -85,6 +84,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/webconsole/console/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/console/src/main/resources/OSGI-INF/bundle.info?rev=1066632&view=auto
==============================================================================
--- karaf/trunk/webconsole/console/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/webconsole/console/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 21:27:45 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 a rebundled Apache Felix Web Console with some changes around
+ security.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mWeb console\u001B[0m section of the Karaf User Guide.
\ No newline at end of file
Modified: karaf/trunk/webconsole/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/pom.xml?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/pom.xml (original)
+++ karaf/trunk/webconsole/features/pom.xml Wed Feb 2 21:27:45 2011
@@ -19,78 +19,94 @@
limitations under the License.
-->
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.karaf.webconsole</groupId>
- <artifactId>webconsole</artifactId>
- <version>2.1.99-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.apache.karaf.webconsole.features</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Karaf :: Web Console :: Features Plugin</name>
-
- <properties>
- <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
- </properties>
-
- <dependencies>
- <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.webconsole</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>org.apache.karaf.features.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20070829</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>!${project.artifactId}*,*</Import-Package>
- <Embed-Dependency>
- <!-- Required for JSON data transfer -->
- <!-- TODO: this needs to be put in a common place for reuse. -->
- json
- </Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>webconsole</artifactId>
+ <version>2.1.99-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.karaf.webconsole.features</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Karaf :: Web Console :: Features Plugin</name>
+ <description>This bundle provides Karaf features plugin for the Web Console.</description>
+
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
+ <dependencies>
+ <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.webconsole</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20070829</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </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>
+ <Import-Package>!${project.artifactId}*,*</Import-Package>
+ <Embed-Dependency>
+ <!-- Required for JSON data transfer -->
+ <!-- TODO: this needs to be put in a common place for reuse. -->
+ json
+ </Embed-Dependency>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Added: karaf/trunk/webconsole/features/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/src/main/resources/OSGI-INF/bundle.info?rev=1066632&view=auto
==============================================================================
--- karaf/trunk/webconsole/features/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/webconsole/features/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 21:27:45 2011
@@ -0,0 +1,13 @@
+\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 features plugin for the Felix Web Console.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mWeb console\u001B[0m section of the Karaf User Guide.
\ No newline at end of file
Modified: karaf/trunk/webconsole/gogo/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/pom.xml?rev=1066632&r1=1066631&r2=1066632&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/pom.xml (original)
+++ karaf/trunk/webconsole/gogo/pom.xml Wed Feb 2 21:27:45 2011
@@ -19,81 +19,97 @@
limitations under the License.
-->
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.karaf.webconsole</groupId>
- <artifactId>webconsole</artifactId>
- <version>2.1.99-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.apache.karaf.webconsole.gogo</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Karaf :: Web Console :: Gogo Plugin</name>
-
- <properties>
- <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
- </properties>
-
- <dependencies>
- <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.webconsole</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.console</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20070829</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>!${project.artifactId}*,
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>webconsole</artifactId>
+ <version>2.1.99-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.karaf.webconsole.gogo</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Karaf :: Web Console :: Gogo Plugin</name>
+ <description>This bundle provides Gogo plugin for the Karaf Web console.</description>
+
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
+ <dependencies>
+ <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.webconsole</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20070829</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </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>
+ <Import-Package>!${project.artifactId}*,
jline;version="[${jline.version}, ${jline.version}]",
*
- </Import-Package>
- <Embed-Dependency>
- <!-- Required for JSON data transfer -->
- <!-- TODO: this needs to be put in a common place for reuse. -->
- json
- </Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ </Import-Package>
+ <Embed-Dependency>
+ <!-- Required for JSON data transfer -->
+ <!-- TODO: this needs to be put in a common place for reuse. -->
+ json
+ </Embed-Dependency>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Added: karaf/trunk/webconsole/gogo/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/src/main/resources/OSGI-INF/bundle.info?rev=1066632&view=auto
==============================================================================
--- karaf/trunk/webconsole/gogo/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/webconsole/gogo/src/main/resources/OSGI-INF/bundle.info Wed Feb 2 21:27:45 2011
@@ -0,0 +1,13 @@
+\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 Gogo plugin for the Apache Felix Web console.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mWeb console\u001B[0m section of the Karaf User Guide.
\ No newline at end of file