You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/05/07 15:09:18 UTC

svn commit: r1335003 - in /karaf/trunk/shell: commands/ commands/src/main/java/org/apache/karaf/shell/commands/ commands/src/main/java/org/apache/karaf/shell/commands/impl/ commands/src/main/java/org/apache/karaf/shell/commands/impl/info/ commands/src/...

Author: cschneider
Date: Mon May  7 13:09:16 2012
New Revision: 1335003

URL: http://svn.apache.org/viewvc?rev=1335003&view=rev
Log:
KARAF-1444 Rename shell.shell to shell.commands.impl and make packages private

Added:
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/CatAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/CatAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ClearAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/ClearAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/EachAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/EachAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/EchoAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/EchoAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ExecuteAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/ExecuteAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/GrepAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/GrepAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/HeadAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/HeadAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/HistoryAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/HistoryAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/IfAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/IfAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/InfoAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/JavaAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/JavaAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/LogoutAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/LogoutAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/MoreAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/MoreAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/NewAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/NewAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/PrintfAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/PrintfAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/SleepAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/SleepAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/SortAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/SortAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/SourceAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/SourceAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/TacAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/TacAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/TailAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/TailAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/WatchAction.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/WatchAction.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/
      - copied from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/info/
    karaf/trunk/shell/commands/src/main/resources/org/apache/karaf/shell/commands/
      - copied from r1334632, karaf/trunk/shell/commands/src/main/resources/org/apache/karaf/shell/shell/
    karaf/trunk/shell/commands/src/main/resources/org/apache/karaf/shell/commands/impl/
    karaf/trunk/shell/commands/src/main/resources/org/apache/karaf/shell/commands/impl/grep.txt
      - copied unchanged from r1334632, karaf/trunk/shell/commands/src/main/resources/org/apache/karaf/shell/shell/grep.txt
    karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/
    karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/
      - copied from r1334632, karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/shell/
    karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/InfoProvider.java
      - copied, changed from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/info/InfoProvider.java
Removed:
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/InfoProvider.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/
    karaf/trunk/shell/commands/src/main/resources/org/apache/karaf/shell/commands/grep.txt
    karaf/trunk/shell/commands/src/main/resources/org/apache/karaf/shell/shell/
    karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/shell/
Modified:
    karaf/trunk/shell/commands/pom.xml
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/InfoBundleTrackerCustomizer.java
    karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/PojoInfoProvider.java
    karaf/trunk/shell/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands
    karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
    karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/GrepTest.java
    karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/InfoTest.java
    karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/SortTest.java

Modified: karaf/trunk/shell/commands/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/pom.xml?rev=1335003&r1=1335002&r2=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/pom.xml (original)
+++ karaf/trunk/shell/commands/pom.xml Mon May  7 13:09:16 2012
@@ -101,21 +101,12 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Import-Package>
-                            org.apache.aries.blueprint,
-                            org.osgi.service.blueprint.container,
-                            org.osgi.service.blueprint.reflect,
-                            org.apache.felix.service.command,
-                            org.apache.karaf.shell.commands,
-                            org.apache.karaf.shell.console,
-                            *
-                        </Import-Package>
                         <Export-Package>
-                            org.apache.karaf.shell.shell*
+                        	!org.apache.karaf.shell.commands.impl*
                         </Export-Package>
                         <Private-Package>
                             org.apache.karaf.util.process;-split-package:=merge-first,
-                            !*
+                            org.apache.karaf.shell.commands.impl*
                         </Private-Package>
                     </instructions>
                 </configuration>

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/CatAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/CatAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/CatAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/CatAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/CatAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/CatAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/CatAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.io.IOException;
 import java.io.BufferedReader;

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ClearAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/ClearAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ClearAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ClearAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/ClearAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/ClearAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ClearAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.AbstractAction;

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/EachAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/EachAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/EachAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/EachAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/EachAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/EachAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/EachAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.util.Collection;
 import java.util.Collections;

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/EchoAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/EchoAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/EchoAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/EchoAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/EchoAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/EchoAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/EchoAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.util.List;
 

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ExecuteAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/ExecuteAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ExecuteAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ExecuteAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/ExecuteAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/ExecuteAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ExecuteAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.util.List;
 

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/GrepAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/GrepAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/GrepAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/GrepAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/GrepAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/GrepAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/GrepAction.java Mon May  7 13:09:16 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.io.BufferedReader;
 import java.io.IOException;

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/HeadAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/HeadAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/HeadAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/HeadAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/HeadAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/HeadAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/HeadAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.io.BufferedReader;
 import java.io.File;

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/HistoryAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/HistoryAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/HistoryAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/HistoryAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/HistoryAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/HistoryAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/HistoryAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import jline.console.history.History;
 import org.apache.karaf.shell.commands.Command;

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/IfAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/IfAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/IfAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/IfAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/IfAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/IfAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/IfAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import org.apache.felix.service.command.Function;
 import org.apache.karaf.shell.commands.Argument;

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/InfoAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/InfoAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/InfoAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.lang.management.ClassLoadingMXBean;
 import java.lang.management.GarbageCollectorMXBean;
@@ -34,8 +34,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.karaf.shell.shell.info.InfoProvider;
 import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.commands.InfoProvider;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.fusesource.jansi.Ansi;
 

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/JavaAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/JavaAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/JavaAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/JavaAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/JavaAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/JavaAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/JavaAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.lang.reflect.Method;
 import java.util.List;

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/LogoutAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/LogoutAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/LogoutAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/LogoutAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/LogoutAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/LogoutAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/LogoutAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.AbstractAction;

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/MoreAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/MoreAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/MoreAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/MoreAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/MoreAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/MoreAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/MoreAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.io.BufferedReader;
 import java.io.IOException;

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/NewAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/NewAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/NewAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/NewAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/NewAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/NewAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/NewAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/PrintfAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/PrintfAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/PrintfAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/PrintfAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/PrintfAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/PrintfAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/PrintfAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.util.Collection;
 

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/SleepAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/SleepAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/SleepAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/SleepAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/SleepAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/SleepAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/SleepAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/SortAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/SortAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/SortAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/SortAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/SortAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/SortAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/SortAction.java Mon May  7 13:09:16 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.io.BufferedReader;
 import java.io.File;

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/SourceAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/SourceAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/SourceAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/SourceAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/SourceAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/SourceAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/SourceAction.java Mon May  7 13:09:16 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.io.BufferedReader;
 import java.io.CharArrayWriter;

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/TacAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/TacAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/TacAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/TacAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/TacAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/TacAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/TacAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.io.StringWriter;
 import java.io.BufferedReader;

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/TailAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/TailAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/TailAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/TailAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/TailAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/TailAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/TailAction.java Mon May  7 13:09:16 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.io.BufferedReader;
 import java.io.File;

Copied: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/WatchAction.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/WatchAction.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/WatchAction.java?p2=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/WatchAction.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/WatchAction.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/WatchAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/WatchAction.java Mon May  7 13:09:16 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/InfoBundleTrackerCustomizer.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/InfoBundleTrackerCustomizer.java?rev=1335003&r1=1334632&r2=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/InfoBundleTrackerCustomizer.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/InfoBundleTrackerCustomizer.java Mon May  7 13:09:16 2012
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell.info;
+package org.apache.karaf.shell.commands.impl.info;
 
+import org.apache.karaf.shell.commands.InfoProvider;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;

Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/PojoInfoProvider.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/PojoInfoProvider.java?rev=1335003&r1=1334632&r2=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/PojoInfoProvider.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/PojoInfoProvider.java Mon May  7 13:09:16 2012
@@ -1,7 +1,9 @@
-package org.apache.karaf.shell.shell.info;
+package org.apache.karaf.shell.commands.impl.info;
 
 import java.util.Properties;
 
+import org.apache.karaf.shell.commands.InfoProvider;
+
 public class PojoInfoProvider implements InfoProvider {
 
 	private String name;

Modified: karaf/trunk/shell/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands?rev=1335003&r1=1335002&r2=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands (original)
+++ karaf/trunk/shell/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands Mon May  7 13:09:16 2012
@@ -14,21 +14,21 @@
 ##  See the License for the specific language governing permissions and
 ##  limitations under the License.
 ##---------------------------------------------------------------------------
-org.apache.karaf.shell.shell.CatAction
-org.apache.karaf.shell.shell.ClearAction
-org.apache.karaf.shell.shell.EachAction
-org.apache.karaf.shell.shell.EchoAction
-org.apache.karaf.shell.shell.ExecuteAction
-org.apache.karaf.shell.shell.GrepAction
-org.apache.karaf.shell.shell.HistoryAction
-org.apache.karaf.shell.shell.HeadAction
-org.apache.karaf.shell.shell.IfAction
-org.apache.karaf.shell.shell.JavaAction
-org.apache.karaf.shell.shell.LogoutAction
-org.apache.karaf.shell.shell.MoreAction
-org.apache.karaf.shell.shell.NewAction
-org.apache.karaf.shell.shell.PrintfAction
-org.apache.karaf.shell.shell.SleepAction
-org.apache.karaf.shell.shell.SortAction
-org.apache.karaf.shell.shell.TacAction
-org.apache.karaf.shell.shell.TailAction
+org.apache.karaf.shell.commands.impl.CatAction
+org.apache.karaf.shell.commands.impl.ClearAction
+org.apache.karaf.shell.commands.impl.EachAction
+org.apache.karaf.shell.commands.impl.EchoAction
+org.apache.karaf.shell.commands.impl.ExecuteAction
+org.apache.karaf.shell.commands.impl.GrepAction
+org.apache.karaf.shell.commands.impl.HistoryAction
+org.apache.karaf.shell.commands.impl.HeadAction
+org.apache.karaf.shell.commands.impl.IfAction
+org.apache.karaf.shell.commands.impl.JavaAction
+org.apache.karaf.shell.commands.impl.LogoutAction
+org.apache.karaf.shell.commands.impl.MoreAction
+org.apache.karaf.shell.commands.impl.NewAction
+org.apache.karaf.shell.commands.impl.PrintfAction
+org.apache.karaf.shell.commands.impl.SleepAction
+org.apache.karaf.shell.commands.impl.SortAction
+org.apache.karaf.shell.commands.impl.TacAction
+org.apache.karaf.shell.commands.impl.TailAction

Modified: karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml?rev=1335003&r1=1335002&r2=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml (original)
+++ karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml Mon May  7 13:09:16 2012
@@ -21,69 +21,69 @@
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.apache.karaf.shell.shell.CatAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.CatAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.ClearAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.ClearAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.EachAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.EachAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.EchoAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.EchoAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.ExecuteAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.ExecuteAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.GrepAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.GrepAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.HistoryAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.HistoryAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.HeadAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.HeadAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.IfAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.IfAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.InfoAction">
+            <action class="org.apache.karaf.shell.commands.impl.InfoAction">
                 <property name="infoProviders" ref="infoProviders"/>
             </action>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.JavaAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.JavaAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.MoreAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.MoreAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.NewAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.NewAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.LogoutAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.LogoutAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.PrintfAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.PrintfAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.SleepAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.SleepAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.SortAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.SortAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.SourceAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.SourceAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.TacAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.TacAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.TailAction"/>
+            <action class="org.apache.karaf.shell.commands.impl.TailAction"/>
         </command>
         <command>
-            <action class="org.apache.karaf.shell.shell.WatchAction">
+            <action class="org.apache.karaf.shell.commands.impl.WatchAction">
                 <property name="commandProcessor" ref="commandProcessor"/>
             </action>
             <completers>
@@ -100,13 +100,13 @@
         <argument ref="blueprintBundleContext" />
         <argument value="32" />
         <argument>
-            <bean class="org.apache.karaf.shell.shell.info.InfoBundleTrackerCustomizer">
+            <bean class="org.apache.karaf.shell.commands.impl.info.InfoBundleTrackerCustomizer">
                 <argument ref="blueprintBundleContext" />
             </bean>
         </argument>
     </bean>
 
-    <reference-list id="infoProviders" interface="org.apache.karaf.shell.shell.info.InfoProvider"
+    <reference-list id="infoProviders" interface="org.apache.karaf.shell.commands.impl.info.InfoProvider"
         availability="optional">
     </reference-list>
 

Modified: karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/GrepTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/GrepTest.java?rev=1335003&r1=1334632&r2=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/GrepTest.java (original)
+++ karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/GrepTest.java Mon May  7 13:09:16 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -24,6 +24,7 @@ import java.util.Arrays;
 
 import junit.framework.TestCase;
 import org.apache.karaf.shell.commands.basic.DefaultActionPreparator;
+import org.apache.karaf.shell.commands.impl.GrepAction;
 
 public class GrepTest extends TestCase {
 

Modified: karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/InfoTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/InfoTest.java?rev=1335003&r1=1334632&r2=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/InfoTest.java (original)
+++ karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/InfoTest.java Mon May  7 13:09:16 2012
@@ -16,9 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import junit.framework.TestCase;
+
+import org.apache.karaf.shell.commands.impl.InfoAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/SortTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/SortTest.java?rev=1335003&r1=1334632&r2=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/SortTest.java (original)
+++ karaf/trunk/shell/commands/src/test/java/org/apache/karaf/shell/commands/impl/SortTest.java Mon May  7 13:09:16 2012
@@ -16,12 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.karaf.shell.shell;
+package org.apache.karaf.shell.commands.impl;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Collections;
 
+import org.apache.karaf.shell.commands.impl.SortAction;
+
 import junit.framework.TestCase;
 
 public class SortTest extends TestCase {

Copied: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/InfoProvider.java (from r1334632, karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/info/InfoProvider.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/InfoProvider.java?p2=karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/InfoProvider.java&p1=karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/info/InfoProvider.java&r1=1334632&r2=1335003&rev=1335003&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/info/InfoProvider.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/InfoProvider.java Mon May  7 13:09:16 2012
@@ -14,10 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.shell.shell.info;
+package org.apache.karaf.shell.commands;
 
 import java.util.Properties;
 
+/**
+ * A bundle can publish a service with this interface to offer some informations for the shell:info command
+ */
 public interface InfoProvider {
 
 	public String getName();