svn commit: r1353170 - in /karaf/branches/karaf-2.3.x/shell/wrapper/src/main: java/org/apache/karaf/shell/wrapper/ resources/META-INF/ resources/META-INF/services/ resources/META-INF/services/org/ resources/META-INF/services/org/apache/ resources/META-...

[io...@apache.org]

Author: iocanel
Date: Sat Jun 23 18:06:54 2012
New Revision: 1353170

URL: http://svn.apache.org/viewvc?rev=1353170&view=rev
Log:
[KARAF-1586] wrapper:install is not discoverable and usable outside OSGi.

Added:
    karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/META-INF/
    karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/META-INF/services/
    karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/META-INF/services/org/
    karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/META-INF/services/org/apache/
    karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/META-INF/services/org/apache/karaf/
    karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/META-INF/services/org/apache/karaf/shell/
    karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/META-INF/services/org/apache/karaf/shell/commands
Modified:
    karaf/branches/karaf-2.3.x/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java

Modified: karaf/branches/karaf-2.3.x/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java?rev=1353170&r1=1353169&r2=1353170&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java (original)
+++ karaf/branches/karaf-2.3.x/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java Sat Jun 23 18:06:54 2012
@@ -28,7 +28,7 @@ import java.util.Scanner;
 import java.util.jar.JarOutputStream;
 import java.util.zip.ZipEntry;
 
-import org.apache.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.AbstractAction;
 import org.apache.felix.gogo.commands.Option;
 import org.apache.felix.gogo.commands.Command;
 import org.fusesource.jansi.Ansi;
@@ -39,7 +39,7 @@ import org.fusesource.jansi.Ansi;
  * @version $Rev: 603634 $ $Date: 2007-12-12 16:07:16 +0100 (Wed, 12 Dec 2007) $
  */
 @Command(scope = "wrapper", name = "install", description = "Install the container as a system service in the OS.")
-public class InstallCommand extends OsgiCommandSupport {
+public class InstallCommand extends AbstractAction {
     @Option(name = "-n", aliases = {"--name"}, description = "The service name that will be used when installing the service. (Default: karaf)", required = false, multiValued = false)
     private String name = "karaf";
 

Added: karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/META-INF/services/org/apache/karaf/shell/commands
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/META-INF/services/org/apache/karaf/shell/commands?rev=1353170&view=auto
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/META-INF/services/org/apache/karaf/shell/commands (added)
+++ karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/META-INF/services/org/apache/karaf/shell/commands Sat Jun 23 18:06:54 2012
@@ -0,0 +1,17 @@
+##---------------------------------------------------------------------------
+##  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.
+##---------------------------------------------------------------------------
+org.apache.karaf.shell.wrapper.InstallCommand