You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ge...@apache.org on 2010/06/29 09:45:13 UTC
svn commit: r958856 [6/8] - in /karaf/trunk: ./ admin/ admin/command/
admin/command/src/main/java/org/apache/felix/
admin/command/src/main/java/org/apache/karaf/
admin/command/src/main/java/org/apache/karaf/admin/command/
admin/command/src/main/java/or...
Modified: karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml (original)
+++ karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml Tue Jun 29 07:45:00 2010
@@ -35,11 +35,11 @@
unbind-method="unregister"/>
</reference-list>
- <bean id="commandCompleter" class="org.apache.felix.karaf.shell.console.completer.CommandsCompleter">
+ <bean id="commandCompleter" class="org.apache.karaf.shell.console.completer.CommandsCompleter">
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <bean id="consoleFactory" class="org.apache.felix.karaf.shell.console.jline.ConsoleFactory">
+ <bean id="consoleFactory" class="org.apache.karaf.shell.console.jline.ConsoleFactory">
<property name="start" value="$[karaf.startLocalConsole]"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
<property name="completers">
@@ -50,7 +50,7 @@
<property name="terminalFactory" ref="terminalFactory"/>
</bean>
- <bean id="terminalFactory" class="org.apache.felix.karaf.shell.console.jline.TerminalFactory"
+ <bean id="terminalFactory" class="org.apache.karaf.shell.console.jline.TerminalFactory"
destroy-method="destroy"/>
Modified: karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml (original)
+++ karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml Tue Jun 29 07:45:00 2010
@@ -23,7 +23,7 @@
<service-properties>
<entry key="osgi.service.blueprint.namespace" value="http://felix.apache.org/karaf/xmlns/shell/v1.0.0"/>
</service-properties>
- <bean class="org.apache.felix.karaf.shell.console.commands.NamespaceHandler"/>
+ <bean class="org.apache.karaf.shell.console.commands.NamespaceHandler"/>
</service>
</blueprint>
Modified: karaf/trunk/shell/console/src/main/resources/org/apache/karaf/shell/console/commands/karaf-shell.xsd
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/resources/org/apache/karaf/shell/console/commands/karaf-shell.xsd?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/resources/org/apache/karaf/shell/console/commands/karaf-shell.xsd (original)
+++ karaf/trunk/shell/console/src/main/resources/org/apache/karaf/shell/console/commands/karaf-shell.xsd Tue Jun 29 07:45:00 2010
@@ -31,7 +31,7 @@
<xsd:annotation>
<xsd:documentation>
- Defines the configuration elements for Apache Felix Karaf commands support.
+ Defines the configuration elements for Apache Karaf commands support.
</xsd:documentation>
</xsd:annotation>
Modified: karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java (original)
+++ karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java Tue Jun 29 07:45:00 2010
@@ -56,4 +56,4 @@ public class Context extends CommandShel
}
-}
\ No newline at end of file
+}
Modified: karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java (original)
+++ karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java Tue Jun 29 07:45:00 2010
@@ -136,4 +136,4 @@ public class TestCommands extends TestCa
return ids;
}
}
-}
\ No newline at end of file
+}
Modified: karaf/trunk/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/pom.xml (original)
+++ karaf/trunk/shell/dev/pom.xml Tue Jun 29 07:45:00 2010
@@ -20,20 +20,20 @@
<parent>
<artifactId>shell</artifactId>
- <groupId>org.apache.felix.karaf.shell</groupId>
+ <groupId>org.apache.karaf.shell</groupId>
<version>1.7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.felix.karaf.shell.dev</artifactId>
+ <artifactId>org.apache.karaf.shell.dev</artifactId>
<packaging>bundle</packaging>
- <name>Apache Felix Karaf :: Shell Development Commands</name>
+ <name>Apache Karaf :: Shell Development Commands</name>
<dependencies>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.console</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
@@ -73,7 +73,7 @@
!${project.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
- org.apache.felix.karaf.shell.console,
+ org.apache.karaf.shell.console,
*
</Import-Package>
<Private-Package>
@@ -87,4 +87,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/AbstractBundleCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/AbstractBundleCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/AbstractBundleCommand.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/AbstractBundleCommand.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev;
+package org.apache.karaf.shell.dev;
import java.util.HashMap;
import java.util.LinkedHashSet;
@@ -22,7 +22,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.felix.gogo.commands.Argument;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.service.packageadmin.ExportedPackage;
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/DynamicImport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/DynamicImport.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/DynamicImport.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/DynamicImport.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev;
+package org.apache.karaf.shell.dev;
import java.io.IOException;
import static java.lang.String.format;
@@ -27,7 +27,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.ops4j.pax.url.wrap.Handler;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkDebug.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkDebug.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkDebug.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkDebug.java Tue Jun 29 07:45:00 2010
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev;
+package org.apache.karaf.shell.dev;
import java.io.File;
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.Option;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
-import org.apache.felix.karaf.shell.dev.framework.Equinox;
-import org.apache.felix.karaf.shell.dev.framework.Felix;
-import org.apache.felix.karaf.shell.dev.framework.Framework;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.dev.framework.Equinox;
+import org.apache.karaf.shell.dev.framework.Felix;
+import org.apache.karaf.shell.dev.framework.Framework;
/**
* Command for enabling/disabling debug logging on the OSGi framework
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/PrintStackTraces.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/PrintStackTraces.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/PrintStackTraces.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/PrintStackTraces.java Tue Jun 29 07:45:00 2010
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev;
+package org.apache.karaf.shell.dev;
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.Argument;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
-import org.apache.felix.karaf.shell.console.jline.Console;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.jline.Console;
import org.osgi.framework.Bundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,4 +44,4 @@ public class PrintStackTraces extends Os
return null;
}
-}
\ No newline at end of file
+}
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/ShowBundleTree.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/ShowBundleTree.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/ShowBundleTree.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/ShowBundleTree.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev;
+package org.apache.karaf.shell.dev;
import static java.lang.String.format;
import java.util.Collection;
@@ -26,11 +26,11 @@ import java.util.Set;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
-import org.apache.felix.karaf.shell.dev.util.Bundles;
-import org.apache.felix.karaf.shell.dev.util.Import;
-import org.apache.felix.karaf.shell.dev.util.Node;
-import org.apache.felix.karaf.shell.dev.util.Tree;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.dev.util.Bundles;
+import org.apache.karaf.shell.dev.util.Import;
+import org.apache.karaf.shell.dev.util.Node;
+import org.apache.karaf.shell.dev.util.Tree;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.service.packageadmin.ExportedPackage;
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/framework/Equinox.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/framework/Equinox.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/framework/Equinox.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/framework/Equinox.java Tue Jun 29 07:45:00 2010
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev.framework;
+package org.apache.karaf.shell.dev.framework;
import java.io.File;
import java.io.IOException;
-import org.apache.felix.karaf.shell.dev.util.IO;
+import org.apache.karaf.shell.dev.util.IO;
/**
* Represents Eclipse's Equinox as the underlying OSGi framework
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/framework/Felix.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/framework/Felix.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/framework/Felix.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/framework/Felix.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev.framework;
+package org.apache.karaf.shell.dev.framework;
import java.io.File;
import java.io.IOException;
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/framework/Framework.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/framework/Framework.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/framework/Framework.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/framework/Framework.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev.framework;
+package org.apache.karaf.shell.dev.framework;
import java.io.BufferedReader;
import java.io.File;
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Bundles.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Bundles.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Bundles.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Bundles.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev.util;
+package org.apache.karaf.shell.dev.util;
import org.osgi.framework.Bundle;
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/IO.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/IO.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/IO.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/IO.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev.util;
+package org.apache.karaf.shell.dev.util;
import java.io.BufferedReader;
import java.io.File;
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Import.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Import.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Import.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Import.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev.util;
+package org.apache.karaf.shell.dev.util;
import java.util.LinkedList;
import java.util.List;
@@ -115,7 +115,7 @@ public class Import {
/*
* Extract the package name from the value
- * e.g. org.apache.felix.karaf;version="1.x" -> org.apache.felix.karaf
+ * e.g. org.apache.karaf;version="1.x" -> org.apache.karaf
*/
private static String extractPackageName(String value) {
if (value.contains(";")) {
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Node.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Node.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Node.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Node.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev.util;
+package org.apache.karaf.shell.dev.util;
import java.io.PrintWriter;
import java.util.HashSet;
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Set;
/**
- * Represents a node in a {@link org.apache.felix.karaf.shell.dev.util.Tree}
+ * Represents a node in a {@link org.apache.karaf.shell.dev.util.Tree}
*/
public class Node<T> {
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Tree.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Tree.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Tree.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Tree.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev.util;
+package org.apache.karaf.shell.dev.util;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
Modified: karaf/trunk/shell/dev/src/main/resources/OSGI-INF/blueprint/shell-dev.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/resources/OSGI-INF/blueprint/shell-dev.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/resources/OSGI-INF/blueprint/shell-dev.xml (original)
+++ karaf/trunk/shell/dev/src/main/resources/OSGI-INF/blueprint/shell-dev.xml Tue Jun 29 07:45:00 2010
@@ -21,16 +21,16 @@
<command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
<command name="dev/show-tree">
- <action class="org.apache.felix.karaf.shell.dev.ShowBundleTree"/>
+ <action class="org.apache.karaf.shell.dev.ShowBundleTree"/>
</command>
<command name="dev/framework">
- <action class="org.apache.felix.karaf.shell.dev.FrameworkDebug" />
+ <action class="org.apache.karaf.shell.dev.FrameworkDebug" />
</command>
<command name="dev/dynamic-import">
- <action class="org.apache.felix.karaf.shell.dev.DynamicImport" />
+ <action class="org.apache.karaf.shell.dev.DynamicImport" />
</command>
<command name="dev/print-stack-traces">
- <action class="org.apache.felix.karaf.shell.dev.PrintStackTraces" />
+ <action class="org.apache.karaf.shell.dev.PrintStackTraces" />
</command>
</command-bundle>
Modified: karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/framework/EquinoxTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/framework/EquinoxTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/framework/EquinoxTest.java (original)
+++ karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/framework/EquinoxTest.java Tue Jun 29 07:45:00 2010
@@ -14,20 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev.framework;
+package org.apache.karaf.shell.dev.framework;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Properties;
-import org.apache.felix.karaf.shell.dev.util.IO;
+import org.apache.karaf.shell.dev.util.IO;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
/**
- * Test cases for {@link org.apache.felix.karaf.shell.dev.framework.Equinox}
+ * Test cases for {@link org.apache.karaf.shell.dev.framework.Equinox}
*/
public class EquinoxTest {
Modified: karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/framework/FelixTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/framework/FelixTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/framework/FelixTest.java (original)
+++ karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/framework/FelixTest.java Tue Jun 29 07:45:00 2010
@@ -14,20 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev.framework;
+package org.apache.karaf.shell.dev.framework;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Properties;
-import org.apache.felix.karaf.shell.dev.util.IO;
+import org.apache.karaf.shell.dev.util.IO;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
/**
- * Test cases for {@link org.apache.felix.karaf.shell.dev.framework.Felix}
+ * Test cases for {@link org.apache.karaf.shell.dev.framework.Felix}
*/
public class FelixTest {
Modified: karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/util/BundlesTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/util/BundlesTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/util/BundlesTest.java (original)
+++ karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/util/BundlesTest.java Tue Jun 29 07:45:00 2010
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev.util;
+package org.apache.karaf.shell.dev.util;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.osgi.framework.Bundle;
/**
- * Test cases for {@link org.apache.felix.karaf.shell.dev.util.Bundles}
+ * Test cases for {@link org.apache.karaf.shell.dev.util.Bundles}
*/
public class BundlesTest {
Modified: karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/util/ImportTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/util/ImportTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/util/ImportTest.java (original)
+++ karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/util/ImportTest.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev.util;
+package org.apache.karaf.shell.dev.util;
import java.util.List;
@@ -25,7 +25,7 @@ import org.apache.felix.utils.version.Ve
import org.junit.Test;
/**
- * Test cases for {@link org.apache.felix.karaf.shell.dev.util.Import}
+ * Test cases for {@link org.apache.karaf.shell.dev.util.Import}
*/
public class ImportTest {
Modified: karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/util/TreeTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/util/TreeTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/util/TreeTest.java (original)
+++ karaf/trunk/shell/dev/src/test/java/org/apache/karaf/shell/dev/util/TreeTest.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.dev.util;
+package org.apache.karaf.shell.dev.util;
import java.io.BufferedReader;
import java.io.IOException;
@@ -30,8 +30,8 @@ import static org.junit.Assert.assertTru
import org.junit.Test;
/**
- * Test cases for {@link org.apache.felix.karaf.shell.dev.util.Tree}
- * and {@link org.apache.felix.karaf.shell.dev.util.Node}
+ * Test cases for {@link org.apache.karaf.shell.dev.util.Tree}
+ * and {@link org.apache.karaf.shell.dev.util.Node}
*/
public class TreeTest {
Modified: karaf/trunk/shell/dev/src/test/resources/org/apache/karaf/shell/dev/framework/config.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/test/resources/org/apache/karaf/shell/dev/framework/config.properties?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/test/resources/org/apache/karaf/shell/dev/framework/config.properties (original)
+++ karaf/trunk/shell/dev/src/test/resources/org/apache/karaf/shell/dev/framework/config.properties Tue Jun 29 07:45:00 2010
@@ -38,8 +38,8 @@ org.osgi.framework.system.packages=org.o
${jre-${java.specification.version}}
org.osgi.framework.system.packages.extra=\
- org.apache.felix.karaf.jaas.boot; version=${karaf.osgi.version}, \
- org.apache.felix.karaf.version; version=${karaf.osgi.version}
+ org.apache.karaf.jaas.boot; version=${karaf.osgi.version}, \
+ org.apache.karaf.version; version=${karaf.osgi.version}
# javax.transaction is needed to avoid class loader constraint violation when using javax.sql
org.osgi.framework.bootdelegation=sun.*,com.sun.*,javax.transaction,javax.transaction.*
Modified: karaf/trunk/shell/dev/src/test/resources/org/apache/karaf/shell/dev/framework/enabled-config.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/test/resources/org/apache/karaf/shell/dev/framework/enabled-config.properties?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/test/resources/org/apache/karaf/shell/dev/framework/enabled-config.properties (original)
+++ karaf/trunk/shell/dev/src/test/resources/org/apache/karaf/shell/dev/framework/enabled-config.properties Tue Jun 29 07:45:00 2010
@@ -42,8 +42,8 @@ org.osgi.framework.system.packages=org.o
${jre-${java.specification.version}}
org.osgi.framework.system.packages.extra=\
- org.apache.felix.karaf.jaas.boot; version=${karaf.osgi.version}, \
- org.apache.felix.karaf.version; version=${karaf.osgi.version}
+ org.apache.karaf.jaas.boot; version=${karaf.osgi.version}, \
+ org.apache.karaf.version; version=${karaf.osgi.version}
# javax.transaction is needed to avoid class loader constraint violation when using javax.sql
org.osgi.framework.bootdelegation=sun.*,com.sun.*,javax.transaction,javax.transaction.*
Modified: karaf/trunk/shell/log/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/pom.xml (original)
+++ karaf/trunk/shell/log/pom.xml Tue Jun 29 07:45:00 2010
@@ -21,16 +21,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf.shell</groupId>
+ <groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.log</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.log</artifactId>
<packaging>bundle</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Shell Log Commands</name>
+ <name>Apache Karaf :: Shell Log Commands</name>
<description>
Provides the OSGi Log commands
@@ -42,8 +42,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.console</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
@@ -84,7 +84,7 @@
!${project.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
- org.apache.felix.karaf.shell.console,
+ org.apache.karaf.shell.console,
*
</Import-Package>
<Private-Package>!*</Private-Package>
Modified: karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayException.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayException.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayException.java (original)
+++ karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayException.java Tue Jun 29 07:45:00 2010
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.log;
+package org.apache.karaf.shell.log;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Command;
@Command(scope = "log", name = "display-exception", description = "Displays the last occured exception from the log.")
Modified: karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayLog.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayLog.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayLog.java (original)
+++ karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayLog.java Tue Jun 29 07:45:00 2010
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.log;
+package org.apache.karaf.shell.log;
-import org.apache.felix.karaf.shell.log.layout.PatternConverter;
-import org.apache.felix.karaf.shell.log.layout.PatternParser;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.log.layout.PatternConverter;
+import org.apache.karaf.shell.log.layout.PatternParser;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Command;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
Modified: karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/GetLogLevel.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/GetLogLevel.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/GetLogLevel.java (original)
+++ karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/GetLogLevel.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.log;
+package org.apache.karaf.shell.log;
import java.util.Dictionary;
import java.util.Enumeration;
@@ -24,7 +24,7 @@ import java.util.TreeMap;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
Modified: karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/Level.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/Level.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/Level.java (original)
+++ karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/Level.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.log;
+package org.apache.karaf.shell.log;
/**
* Enumeration of available log levels for the log:set command and
Modified: karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/LruList.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/LruList.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/LruList.java (original)
+++ karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/LruList.java Tue Jun 29 07:45:00 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.shell.log;
+package org.apache.karaf.shell.log;
import java.util.Arrays;
Modified: karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/SetLogLevel.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/SetLogLevel.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/SetLogLevel.java (original)
+++ karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/SetLogLevel.java Tue Jun 29 07:45:00 2010
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.log;
+package org.apache.karaf.shell.log;
import java.io.IOException;
import java.util.Dictionary;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.ServiceReference;
Modified: karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/VmLogAppender.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/VmLogAppender.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/VmLogAppender.java (original)
+++ karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/VmLogAppender.java Tue Jun 29 07:45:00 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.shell.log;
+package org.apache.karaf.shell.log;
import org.ops4j.pax.logging.spi.PaxAppender;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
Modified: karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/completers/LogLevelCompleter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/completers/LogLevelCompleter.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/completers/LogLevelCompleter.java (original)
+++ karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/completers/LogLevelCompleter.java Tue Jun 29 07:45:00 2010
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.log.completers;
+package org.apache.karaf.shell.log.completers;
import java.util.List;
-import org.apache.felix.karaf.shell.console.Completer;
-import org.apache.felix.karaf.shell.console.completer.StringsCompleter;
-import org.apache.felix.karaf.shell.log.Level;
+import org.apache.karaf.shell.console.Completer;
+import org.apache.karaf.shell.console.completer.StringsCompleter;
+import org.apache.karaf.shell.log.Level;
/**
* {@link Completer} implementation for completing log levels
Modified: karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/AbsoluteTimeDateFormat.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/AbsoluteTimeDateFormat.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/AbsoluteTimeDateFormat.java (original)
+++ karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/AbsoluteTimeDateFormat.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.log.layout;
+package org.apache.karaf.shell.log.layout;
import java.text.DateFormat;
import java.text.FieldPosition;
Modified: karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/DateTimeDateFormat.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/DateTimeDateFormat.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/DateTimeDateFormat.java (original)
+++ karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/DateTimeDateFormat.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.log.layout;
+package org.apache.karaf.shell.log.layout;
import java.text.DateFormatSymbols;
import java.text.FieldPosition;
Modified: karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/FormattingInfo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/FormattingInfo.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/FormattingInfo.java (original)
+++ karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/FormattingInfo.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.log.layout;
+package org.apache.karaf.shell.log.layout;
/**
Modified: karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/ISO8601DateFormat.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/ISO8601DateFormat.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/ISO8601DateFormat.java (original)
+++ karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/ISO8601DateFormat.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.log.layout;
+package org.apache.karaf.shell.log.layout;
import java.text.FieldPosition;
import java.text.ParsePosition;
Modified: karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/PatternConverter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/PatternConverter.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/PatternConverter.java (original)
+++ karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/PatternConverter.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.log.layout;
+package org.apache.karaf.shell.log.layout;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
Modified: karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/PatternParser.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/PatternParser.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/PatternParser.java (original)
+++ karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/layout/PatternParser.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.log.layout;
+package org.apache.karaf.shell.log.layout;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
Modified: karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml (original)
+++ karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml Tue Jun 29 07:45:00 2010
@@ -22,7 +22,7 @@
<!-- TODO: use dynamic CM config -->
- <cm:property-placeholder persistent-id="org.apache.felix.karaf.log">
+ <cm:property-placeholder persistent-id="org.apache.karaf.log">
<cm:default-properties>
<cm:property name="size" value="500"/>
<cm:property name="pattern" value="%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n"/>
@@ -31,23 +31,23 @@
<command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
<command name="log/display">
- <action class="org.apache.felix.karaf.shell.log.DisplayLog">
+ <action class="org.apache.karaf.shell.log.DisplayLog">
<property name="events" ref="events"/>
<property name="pattern" value="${pattern}"/>
</action>
</command>
<link name="log/d" target="log/display"/>
<command name="log/display-exception">
- <action class="org.apache.felix.karaf.shell.log.DisplayException">
+ <action class="org.apache.karaf.shell.log.DisplayException">
<property name="events" ref="events"/>
</action>
</command>
<link name="log/de" target="log/display-exception"/>
<command name="log/get">
- <action class="org.apache.felix.karaf.shell.log.GetLogLevel" />
+ <action class="org.apache.karaf.shell.log.GetLogLevel" />
</command>
<command name="log/set">
- <action class="org.apache.felix.karaf.shell.log.SetLogLevel" />
+ <action class="org.apache.karaf.shell.log.SetLogLevel" />
<completers>
<ref component-id="logLevelCompleter"/>
<null/>
@@ -58,15 +58,15 @@
<alias name="lde" alias="log/de"/>
</command-bundle>
- <bean id="vmLogAppender" class="org.apache.felix.karaf.shell.log.VmLogAppender">
+ <bean id="vmLogAppender" class="org.apache.karaf.shell.log.VmLogAppender">
<property name="events" ref="events"/>
</bean>
- <bean id="events" class="org.apache.felix.karaf.shell.log.LruList">
+ <bean id="events" class="org.apache.karaf.shell.log.LruList">
<argument value="${size}"/>
</bean>
- <bean id="logLevelCompleter" class="org.apache.felix.karaf.shell.log.completers.LogLevelCompleter"/>
+ <bean id="logLevelCompleter" class="org.apache.karaf.shell.log.completers.LogLevelCompleter"/>
<service ref="vmLogAppender" interface="org.ops4j.pax.logging.spi.PaxAppender">
<service-properties>
Modified: karaf/trunk/shell/log/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ karaf/trunk/shell/log/src/main/resources/OSGI-INF/metatype/metatype.properties Tue Jun 29 07:45:00 2010
@@ -21,8 +21,8 @@
# This file contains localization strings for configuration labels and
# descriptions as used in the metatype.xml descriptor
-log.name = Apache Felix Karaf Log
-log.description = Configuration of Apache Felix Karaf Log
+log.name = Apache Karaf Log
+log.description = Configuration of Apache Karaf Log
size.name = Size
size.description = size of the log to keep in memory
Modified: karaf/trunk/shell/log/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/resources/OSGI-INF/metatype/metatype.xml (original)
+++ karaf/trunk/shell/log/src/main/resources/OSGI-INF/metatype/metatype.xml Tue Jun 29 07:45:00 2010
@@ -18,13 +18,13 @@
-->
<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0" localization="OSGI-INF/metatype/metatype">
- <OCD id="org.apache.felix.karaf.log" name="%log.name" description="%log.description">
+ <OCD id="org.apache.karaf.log" name="%log.name" description="%log.description">
<AD id="size" type="Integer" default="500" name="%size.name"
description="%size.description"/>
<AD id="pattern" type="String" default="%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n" name="%pattern.name"
description="%pattern.description"/>
</OCD>
- <Designate pid="org.apache.felix.karaf.log">
- <Object ocdref="org.apache.felix.karaf.log"/>
+ <Designate pid="org.apache.karaf.log">
+ <Object ocdref="org.apache.karaf.log"/>
</Designate>
</metatype:MetaData>
Modified: karaf/trunk/shell/log/src/test/java/org/apache/karaf/shell/log/SetLogLevelTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/test/java/org/apache/karaf/shell/log/SetLogLevelTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/test/java/org/apache/karaf/shell/log/SetLogLevelTest.java (original)
+++ karaf/trunk/shell/log/src/test/java/org/apache/karaf/shell/log/SetLogLevelTest.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.log;
+package org.apache.karaf.shell.log;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Modified: karaf/trunk/shell/log/src/test/java/org/apache/karaf/shell/log/completers/LogLevelCompleterTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/test/java/org/apache/karaf/shell/log/completers/LogLevelCompleterTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/test/java/org/apache/karaf/shell/log/completers/LogLevelCompleterTest.java (original)
+++ karaf/trunk/shell/log/src/test/java/org/apache/karaf/shell/log/completers/LogLevelCompleterTest.java Tue Jun 29 07:45:00 2010
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.log.completers;
+package org.apache.karaf.shell.log.completers;
import java.util.LinkedList;
import java.util.List;
-import org.apache.felix.karaf.shell.log.Level;
+import org.apache.karaf.shell.log.Level;
import junit.framework.TestCase;
Modified: karaf/trunk/shell/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/obr/pom.xml (original)
+++ karaf/trunk/shell/obr/pom.xml Tue Jun 29 07:45:00 2010
@@ -21,16 +21,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf.shell</groupId>
+ <groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.obr</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.obr</artifactId>
<packaging>bundle</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Shell OBR Commands</name>
+ <name>Apache Karaf :: Shell OBR Commands</name>
<description>
Provides the OBR Shell commands
@@ -53,8 +53,8 @@
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.console</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
</dependencies>
@@ -73,7 +73,7 @@
!${project.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
- org.apache.felix.karaf.shell.console,
+ org.apache.karaf.shell.console,
*
</Import-Package>
<Private-Package>!*</Private-Package>
Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/AddUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/AddUrlCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/AddUrlCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/AddUrlCommand.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.obr;
+package org.apache.karaf.shell.obr;
import java.util.List;
Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/DeployCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/DeployCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/DeployCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/DeployCommand.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.obr;
+package org.apache.karaf.shell.obr;
import java.util.List;
Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.obr;
+package org.apache.karaf.shell.obr;
import java.io.PrintStream;
import java.lang.reflect.Array;
@@ -130,4 +130,4 @@ public class FindCommand extends ObrComm
}
}
-}
\ No newline at end of file
+}
Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/InfoCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/InfoCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/InfoCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/InfoCommand.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.obr;
+package org.apache.karaf.shell.obr;
import java.io.PrintStream;
import java.lang.reflect.Array;
Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.obr;
+package org.apache.karaf.shell.obr;
import java.util.List;
Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListUrlCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListUrlCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListUrlCommand.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.obr;
+package org.apache.karaf.shell.obr;
import org.apache.felix.bundlerepository.Repository;
import org.apache.felix.bundlerepository.RepositoryAdmin;
Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.obr;
+package org.apache.karaf.shell.obr;
import java.io.PrintStream;
import java.util.List;
@@ -24,7 +24,7 @@ import org.apache.felix.bundlerepository
import org.apache.felix.bundlerepository.Requirement;
import org.apache.felix.bundlerepository.Resolver;
import org.apache.felix.bundlerepository.Resource;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.osgi.framework.Bundle;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RefreshUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RefreshUrlCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RefreshUrlCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RefreshUrlCommand.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.obr;
+package org.apache.karaf.shell.obr;
import java.util.List;
Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RemoveUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RemoveUrlCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RemoveUrlCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RemoveUrlCommand.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.obr;
+package org.apache.karaf.shell.obr;
import java.util.List;
Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ResolveCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ResolveCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ResolveCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ResolveCommand.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.obr;
+package org.apache.karaf.shell.obr;
import java.util.ArrayList;
import java.util.Arrays;
@@ -140,4 +140,4 @@ public class ResolveCommand extends ObrC
}
}
-}
\ No newline at end of file
+}
Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/SourceCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/SourceCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/SourceCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/SourceCommand.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.obr;
+package org.apache.karaf.shell.obr;
import java.net.URI;
import java.net.URL;
@@ -25,7 +25,7 @@ import org.apache.felix.bundlerepository
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.karaf.shell.obr.util.FileUtil;
+import org.apache.karaf.shell.obr.util.FileUtil;
@Command(scope = "obr", name = "source", description = "Download the sources for an OBR bundle.")
public class SourceCommand extends ObrCommandSupport {
Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/StartCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/StartCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/StartCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/StartCommand.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.obr;
+package org.apache.karaf.shell.obr;
import org.apache.felix.bundlerepository.RepositoryAdmin;
import org.apache.felix.gogo.commands.Command;
Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/util/FileUtil.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/util/FileUtil.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/util/FileUtil.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/util/FileUtil.java Tue Jun 29 07:45:00 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.shell.obr.util;
+package org.apache.karaf.shell.obr.util;
import java.io.BufferedOutputStream;
import java.io.File;
Modified: karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml (original)
+++ karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml Tue Jun 29 07:45:00 2010
@@ -21,37 +21,37 @@
<command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
<command name="obr/addUrl">
- <action class="org.apache.felix.karaf.shell.obr.AddUrlCommand"/>
+ <action class="org.apache.karaf.shell.obr.AddUrlCommand"/>
</command>
<command name="obr/deploy">
- <action class="org.apache.felix.karaf.shell.obr.DeployCommand"/>
+ <action class="org.apache.karaf.shell.obr.DeployCommand"/>
</command>
<command name="obr/find">
- <action class="org.apache.felix.karaf.shell.obr.FindCommand"/>
+ <action class="org.apache.karaf.shell.obr.FindCommand"/>
</command>
<command name="obr/info">
- <action class="org.apache.felix.karaf.shell.obr.InfoCommand"/>
+ <action class="org.apache.karaf.shell.obr.InfoCommand"/>
</command>
<command name="obr/list">
- <action class="org.apache.felix.karaf.shell.obr.ListCommand"/>
+ <action class="org.apache.karaf.shell.obr.ListCommand"/>
</command>
<command name="obr/listUrl">
- <action class="org.apache.felix.karaf.shell.obr.ListUrlCommand"/>
+ <action class="org.apache.karaf.shell.obr.ListUrlCommand"/>
</command>
<command name="obr/refreshUrl">
- <action class="org.apache.felix.karaf.shell.obr.RefreshUrlCommand"/>
+ <action class="org.apache.karaf.shell.obr.RefreshUrlCommand"/>
</command>
<command name="obr/removeUrl">
- <action class="org.apache.felix.karaf.shell.obr.RemoveUrlCommand"/>
+ <action class="org.apache.karaf.shell.obr.RemoveUrlCommand"/>
</command>
<command name="obr/resolve">
- <action class="org.apache.felix.karaf.shell.obr.ResolveCommand"/>
+ <action class="org.apache.karaf.shell.obr.ResolveCommand"/>
</command>
<command name="obr/source">
- <action class="org.apache.felix.karaf.shell.obr.SourceCommand"/>
+ <action class="org.apache.karaf.shell.obr.SourceCommand"/>
</command>
<command name="obr/start">
- <action class="org.apache.felix.karaf.shell.obr.StartCommand"/>
+ <action class="org.apache.karaf.shell.obr.StartCommand"/>
</command>
</command-bundle>
Modified: karaf/trunk/shell/osgi/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/pom.xml (original)
+++ karaf/trunk/shell/osgi/pom.xml Tue Jun 29 07:45:00 2010
@@ -21,16 +21,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf.shell</groupId>
+ <groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.osgi</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.osgi</artifactId>
<packaging>bundle</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Shell OSGi Commands</name>
+ <name>Apache Karaf :: Shell OSGi Commands</name>
<description>
Provides the OSGi Shell commands
@@ -42,8 +42,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.console</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
@@ -82,7 +82,7 @@
!${project.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
- org.apache.felix.karaf.shell.console,
+ org.apache.karaf.shell.console,
org.springframework*;resolution:=optional,
*
</Import-Package>
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BlueprintListener.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BlueprintListener.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BlueprintListener.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BlueprintListener.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundleCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundleCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundleCommand.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundleCommand.java Tue Jun 29 07:45:00 2010
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Argument;
import org.osgi.framework.Bundle;
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=958856&r1=958851&r2=958856&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 Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundleStateListener.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundleStateListener.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundleStateListener.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundleStateListener.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
import org.osgi.framework.Bundle;
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundlesCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundlesCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundlesCommand.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundlesCommand.java Tue Jun 29 07:45:00 2010
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
import java.util.ArrayList;
import java.util.List;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Option;
import org.osgi.framework.Bundle;
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundlesCommandOptional.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundlesCommandOptional.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundlesCommandOptional.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundlesCommandOptional.java Tue Jun 29 07:45:00 2010
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
import java.util.ArrayList;
import java.util.List;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Option;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.osgi.framework.Bundle;
public abstract class BundlesCommandOptional extends OsgiCommandSupport {
@@ -51,4 +51,4 @@ public abstract class BundlesCommandOpti
}
protected abstract void doExecute(List<Bundle> bundles) throws Exception;
-}
\ No newline at end of file
+}
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=958856&r1=958851&r2=958856&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 Tue Jun 29 07:45:00 2010
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.List;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.Bundle;
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=958856&r1=958851&r2=958856&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 Tue Jun 29 07:45:00 2010
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.List;
import org.apache.felix.gogo.commands.Argument;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.Bundle;
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=958856&r1=958851&r2=958856&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 Tue Jun 29 07:45:00 2010
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
import java.util.List;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.Bundle;
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=958856&r1=958851&r2=958856&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 Tue Jun 29 07:45:00 2010
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
import java.util.List;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Command;
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=958856&r1=958851&r2=958856&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 Tue Jun 29 07:45:00 2010
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
import java.util.List;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.Bundle;
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=958856&r1=958851&r2=958856&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 Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
import java.util.List;
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=958856&r1=958851&r2=958856&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 Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
import java.util.List;
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=958856&r1=958851&r2=958856&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 Tue Jun 29 07:45:00 2010
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.Bundle;
@@ -33,7 +33,7 @@ public class Shutdown extends OsgiComman
Bundle bundle = getBundleContext().getBundle(0);
bundle.stop();
} catch (Exception e) {
- log.error("Error when shutting down Apache Felix Karaf", e);
+ log.error("Error when shutting down Apache Karaf", e);
}
}
}.start();
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/SpringStateListenerFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/SpringStateListenerFactory.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/SpringStateListenerFactory.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/SpringStateListenerFactory.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
import java.util.Map;
import java.util.Hashtable;
@@ -66,7 +66,7 @@ public class SpringStateListenerFactory
try {
// Use dynamic class loading to make sure we actually try to reload the class for
// dynamic imports to kick in if possible
- Class cl = getClass().getClassLoader().loadClass("org.apache.felix.karaf.shell.osgi.SpringStateListenerFactory$SpringApplicationListener");
+ Class cl = getClass().getClassLoader().loadClass("org.apache.karaf.shell.osgi.SpringStateListenerFactory$SpringApplicationListener");
return (BundleStateListener) cl.getConstructor(BundleContext.class).newInstance(bundleContext);
// return new SpringApplicationListener(bundleContext);
} catch (Throwable t) {
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=958856&r1=958851&r2=958856&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 Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
import java.util.List;
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=958856&r1=958851&r2=958856&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 Tue Jun 29 07:45:00 2010
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.ServiceReference;
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=958856&r1=958851&r2=958856&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 Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.shell.osgi;
+package org.apache.karaf.shell.osgi;
import java.util.List;