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 [7/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/osgi/src/main/java/org/apache/karaf/shell/osgi/UninstallBundle.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/UninstallBundle.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/UninstallBundle.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/UninstallBundle.java 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/UpdateBundle.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/UpdateBundle.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/UpdateBundle.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/UpdateBundle.java 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.io.InputStream;
import java.net.URL;
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Util.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Util.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Util.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Util.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.osgi;
+package org.apache.karaf.shell.osgi;
import java.io.IOException;
Modified: karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml (original)
+++ karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.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="osgi/bundle-level">
- <action class="org.apache.felix.karaf.shell.osgi.BundleLevel"/>
+ <action class="org.apache.karaf.shell.osgi.BundleLevel"/>
</command>
<command name="osgi/headers">
- <action class="org.apache.felix.karaf.shell.osgi.Headers"/>
+ <action class="org.apache.karaf.shell.osgi.Headers"/>
</command>
<command name="osgi/install">
- <action class="org.apache.felix.karaf.shell.osgi.InstallBundle"/>
+ <action class="org.apache.karaf.shell.osgi.InstallBundle"/>
</command>
<command name="osgi/list">
- <action class="org.apache.felix.karaf.shell.osgi.ListBundles">
+ <action class="org.apache.karaf.shell.osgi.ListBundles">
<property name="bundleStateListenerFactories">
<list xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
<ref component-id="blueprintListener" />
@@ -40,42 +40,42 @@
</action>
</command>
<command name="osgi/ls">
- <action class="org.apache.felix.karaf.shell.osgi.ListServices"/>
+ <action class="org.apache.karaf.shell.osgi.ListServices"/>
</command>
<command name="osgi/refresh">
- <action class="org.apache.felix.karaf.shell.osgi.RefreshBundle"/>
+ <action class="org.apache.karaf.shell.osgi.RefreshBundle"/>
</command>
<command name="osgi/update">
- <action class="org.apache.felix.karaf.shell.osgi.UpdateBundle"/>
+ <action class="org.apache.karaf.shell.osgi.UpdateBundle"/>
</command>
<command name="osgi/resolve">
- <action class="org.apache.felix.karaf.shell.osgi.ResolveBundle"/>
+ <action class="org.apache.karaf.shell.osgi.ResolveBundle"/>
</command>
<command name="osgi/restart">
- <action class="org.apache.felix.karaf.shell.osgi.RestartBundle"/>
+ <action class="org.apache.karaf.shell.osgi.RestartBundle"/>
</command>
<command name="osgi/shutdown">
- <action class="org.apache.felix.karaf.shell.osgi.Shutdown"/>
+ <action class="org.apache.karaf.shell.osgi.Shutdown"/>
</command>
<command name="osgi/start">
- <action class="org.apache.felix.karaf.shell.osgi.StartBundle"/>
+ <action class="org.apache.karaf.shell.osgi.StartBundle"/>
</command>
<command name="osgi/start-level">
- <action class="org.apache.felix.karaf.shell.osgi.StartLevel"/>
+ <action class="org.apache.karaf.shell.osgi.StartLevel"/>
</command>
<command name="osgi/stop">
- <action class="org.apache.felix.karaf.shell.osgi.StopBundle"/>
+ <action class="org.apache.karaf.shell.osgi.StopBundle"/>
</command>
<command name="osgi/uninstall">
- <action class="org.apache.felix.karaf.shell.osgi.UninstallBundle"/>
+ <action class="org.apache.karaf.shell.osgi.UninstallBundle"/>
</command>
</command-bundle>
- <bean id="blueprintListener" class="org.apache.felix.karaf.shell.osgi.BlueprintListener" />
+ <bean id="blueprintListener" class="org.apache.karaf.shell.osgi.BlueprintListener" />
<service ref="blueprintListener" interface="org.osgi.service.blueprint.container.BlueprintListener" />
- <bean id="springListener" class="org.apache.felix.karaf.shell.osgi.SpringStateListenerFactory" init-method="init" destroy-method="destroy">
+ <bean id="springListener" class="org.apache.karaf.shell.osgi.SpringStateListenerFactory" init-method="init" destroy-method="destroy">
<property name="bundleContext" ref="blueprintBundleContext" />
</bean>
-</blueprint>
\ No newline at end of file
+</blueprint>
Modified: karaf/trunk/shell/packages/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/packages/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/packages/pom.xml (original)
+++ karaf/trunk/shell/packages/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.packages</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.packages</artifactId>
<packaging>bundle</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Shell PackageAdmin Commands</name>
+ <name>Apache Karaf :: Shell PackageAdmin Commands</name>
<description>
Provides the PackageAdmin 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>
@@ -72,7 +72,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/packages/src/main/java/org/apache/karaf/shell/packages/ExportsCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/ExportsCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/ExportsCommand.java (original)
+++ karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/ExportsCommand.java 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.packages;
+package org.apache.karaf.shell.packages;
import java.io.PrintStream;
import java.util.List;
Modified: karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/ImportsCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/ImportsCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/ImportsCommand.java (original)
+++ karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/ImportsCommand.java 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.packages;
+package org.apache.karaf.shell.packages;
import java.io.PrintStream;
import java.util.ArrayList;
Modified: karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/PackageCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/PackageCommandSupport.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/PackageCommandSupport.java (original)
+++ karaf/trunk/shell/packages/src/main/java/org/apache/karaf/shell/packages/PackageCommandSupport.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.packages;
+package org.apache.karaf.shell.packages;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.osgi.framework.ServiceReference;
import org.osgi.service.packageadmin.PackageAdmin;
Modified: karaf/trunk/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml (original)
+++ karaf/trunk/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml Tue Jun 29 07:45:00 2010
@@ -21,10 +21,10 @@
<command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
<command name="packages/exports">
- <action class="org.apache.felix.karaf.shell.packages.ExportsCommand"/>
+ <action class="org.apache.karaf.shell.packages.ExportsCommand"/>
</command>
<command name="packages/imports">
- <action class="org.apache.felix.karaf.shell.packages.ImportsCommand"/>
+ <action class="org.apache.karaf.shell.packages.ImportsCommand"/>
</command>
</command-bundle>
Modified: karaf/trunk/shell/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/pom.xml (original)
+++ karaf/trunk/shell/pom.xml Tue Jun 29 07:45:00 2010
@@ -21,16 +21,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf</groupId>
+ <groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.shell</groupId>
+ <groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
<packaging>pom</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Shell</name>
+ <name>Apache Karaf :: Shell</name>
<modules>
<module>commands</module>
Modified: karaf/trunk/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/pom.xml (original)
+++ karaf/trunk/shell/ssh/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.ssh</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.ssh</artifactId>
<packaging>bundle</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Shell SSH</name>
+ <name>Apache Karaf :: Shell SSH</name>
<description>
Provides SSH support to the console
@@ -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>
@@ -91,12 +91,12 @@
!${project.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
- org.apache.felix.karaf.shell.console,
+ org.apache.karaf.shell.console,
org.apache.sshd.server.keyprovider,
org.apache.sshd.server.jaas,
*
</Import-Package>
- <Private-Package>org.apache.felix.karaf.jpm.*</Private-Package>
+ <Private-Package>org.apache.karaf.jpm.*</Private-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
</configuration>
Modified: karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommandFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommandFactory.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommandFactory.java (original)
+++ karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommandFactory.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.ssh;
+package org.apache.karaf.shell.ssh;
import java.io.Closeable;
import java.io.IOException;
Modified: karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java (original)
+++ karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java Tue Jun 29 07:45:00 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.karaf.shell.ssh;
+package org.apache.karaf.shell.ssh;
import java.io.Closeable;
import java.io.FilterOutputStream;
@@ -31,9 +31,9 @@ import java.util.Properties;
import java.util.concurrent.Callable;
import jline.Terminal;
-import org.apache.felix.karaf.shell.console.Completer;
-import org.apache.felix.karaf.shell.console.completer.AggregateCompleter;
-import org.apache.felix.karaf.shell.console.jline.Console;
+import org.apache.karaf.shell.console.Completer;
+import org.apache.karaf.shell.console.completer.AggregateCompleter;
+import org.apache.karaf.shell.console.jline.Console;
import org.apache.sshd.common.Factory;
import org.apache.sshd.server.Command;
import org.apache.sshd.server.Environment;
Modified: karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java (original)
+++ karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java Tue Jun 29 07:45:00 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.karaf.shell.ssh;
+package org.apache.karaf.shell.ssh;
import java.io.IOException;
@@ -28,8 +28,8 @@ import org.apache.sshd.client.channel.Ch
import org.apache.sshd.client.future.ConnectFuture;
import org.apache.sshd.common.util.NoCloseInputStream;
import org.apache.sshd.common.util.NoCloseOutputStream;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
-import org.apache.felix.karaf.shell.console.BlueprintContainerAware;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.BlueprintContainerAware;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
Modified: karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerAction.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerAction.java (original)
+++ karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerAction.java Tue Jun 29 07:45:00 2010
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.felix.karaf.shell.ssh;
+package org.apache.karaf.shell.ssh;
import org.apache.sshd.SshServer;
-import org.apache.felix.karaf.shell.console.BlueprintContainerAware;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.BlueprintContainerAware;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Command;
import org.slf4j.Logger;
Modified: karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerFactory.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerFactory.java (original)
+++ karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerFactory.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.ssh;
+package org.apache.karaf.shell.ssh;
import org.apache.sshd.SshServer;
Modified: karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java (original)
+++ karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.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.ssh;
+package org.apache.karaf.shell.ssh;
import java.io.InputStream;
import java.io.IOException;
Modified: karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml (original)
+++ karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml Tue Jun 29 07:45:00 2010
@@ -24,12 +24,12 @@
default-activation="lazy">
<type-converters>
- <bean class="org.apache.felix.karaf.shell.ssh.ShellFactoryImpl" factory-method="getConverter" />
+ <bean class="org.apache.karaf.shell.ssh.ShellFactoryImpl" factory-method="getConverter" />
</type-converters>
<ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]"/>
- <cm:property-placeholder persistent-id="org.apache.felix.karaf.shell">
+ <cm:property-placeholder persistent-id="org.apache.karaf.shell">
<cm:default-properties>
<cm:property name="sshPort" value="8101"/>
<cm:property name="sshHost" value="0.0.0.0"/>
@@ -40,14 +40,14 @@
<command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
<command name="ssh/ssh">
- <action class="org.apache.felix.karaf.shell.ssh.SshAction">
+ <action class="org.apache.karaf.shell.ssh.SshAction">
<property name="sshClientId">
<bp:idref component-id="sshClient"/>
</property>
</action>
</command>
<command name="ssh/sshd">
- <action class="org.apache.felix.karaf.shell.ssh.SshServerAction">
+ <action class="org.apache.karaf.shell.ssh.SshServerAction">
<property name="sshServerId">
<bp:idref component-id="sshServer"/>
</property>
@@ -62,7 +62,7 @@
<property name="port" value="${sshPort}"/>
<property name="host" value="${sshHost}"/>
<property name="shellFactory">
- <bean class="org.apache.felix.karaf.shell.ssh.ShellFactoryImpl">
+ <bean class="org.apache.karaf.shell.ssh.ShellFactoryImpl">
<property name="completers">
<list>
<ref component-id="commandCompleter"/>
@@ -72,7 +72,7 @@
</bean>
</property>
<property name="commandFactory">
- <bean class="org.apache.felix.karaf.shell.ssh.ShellCommandFactory">
+ <bean class="org.apache.karaf.shell.ssh.ShellCommandFactory">
<property name="commandProcessor" ref="commandProcessor"/>
</bean>
</property>
@@ -87,7 +87,7 @@
<property name="domain" value="${sshRealm}"/>
</bean>
- <bean id="sshServerFactory" class="org.apache.felix.karaf.shell.ssh.SshServerFactory" init-method="start"
+ <bean id="sshServerFactory" class="org.apache.karaf.shell.ssh.SshServerFactory" init-method="start"
destroy-method="stop" activation="eager">
<argument ref="sshServer"/>
<property name="start" value="$[karaf.startRemoteShell]"/>
@@ -103,7 +103,7 @@
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>
Modified: karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ karaf/trunk/shell/ssh/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
-shell.name = Apache Felix Karaf Shell
-shell.description = Configuration of Apache Felix Karaf Shell
+shell.name = Apache Karaf Shell
+shell.description = Configuration of Apache Karaf Shell
sshPort.name = SSH Port
sshPort.description = port of the SSH daemon
Modified: karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml (original)
+++ karaf/trunk/shell/ssh/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.shell" name="%shell.name" description="%shell.description">
+ <OCD id="org.apache.karaf.shell" name="%shell.name" description="%shell.description">
<AD id="sshPort" type="Integer" default="8101" name="%sshPort.name" description="%sshPort.description"/>
<AD id="sshHost" type="String" default="0.0.0.0" name="%sshHost.name" description="%sshHost.description"/>
<AD id="sshRealm" type="String" default="karaf" name="%sshRealm.name" description="%sshRealm.description"/>
<AD id="hostKey" type="String" default="${karaf.base}/etc/host.key" name="%hostKey.name" description="%hostKey.description"/>
</OCD>
- <Designate pid="org.apache.felix.karaf.shell">
- <Object ocdref="org.apache.felix.karaf.shell"/>
+ <Designate pid="org.apache.karaf.shell">
+ <Object ocdref="org.apache.karaf.shell"/>
</Designate>
</metatype:MetaData>
Modified: karaf/trunk/shell/wrapper/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/wrapper/pom.xml (original)
+++ karaf/trunk/shell/wrapper/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.wrapper</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.wrapper</artifactId>
<packaging>bundle</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Shell Service Wrapper</name>
+ <name>Apache Karaf :: Shell Service Wrapper</name>
<description>
Provides the Service Wrapper Shell integration
@@ -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>
@@ -88,7 +88,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/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java (original)
+++ karaf/trunk/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.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.wrapper;
+package org.apache.karaf.shell.wrapper;
import java.io.File;
import java.io.FileOutputStream;
@@ -26,7 +26,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Scanner;
-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.fusesource.jansi.Ansi;
Modified: karaf/trunk/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/PumpStreamHandler.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/PumpStreamHandler.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/PumpStreamHandler.java (original)
+++ karaf/trunk/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/PumpStreamHandler.java Tue Jun 29 07:45:00 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.karaf.shell.wrapper;
+package org.apache.karaf.shell.wrapper;
import java.io.InputStream;
import java.io.OutputStream;
@@ -229,4 +229,4 @@ public class PumpStreamHandler
pumper.setAutoflush(true);
return pumper;
}
-}
\ No newline at end of file
+}
Modified: karaf/trunk/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/StreamPumper.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/StreamPumper.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/StreamPumper.java (original)
+++ karaf/trunk/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/StreamPumper.java Tue Jun 29 07:45:00 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.karaf.shell.wrapper;
+package org.apache.karaf.shell.wrapper;
import java.io.InputStream;
import java.io.OutputStream;
@@ -196,4 +196,4 @@ public class StreamPumper
notifyAll();
}
-}
\ No newline at end of file
+}
Modified: karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml (original)
+++ karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml Tue Jun 29 07:45:00 2010
@@ -21,7 +21,7 @@
<command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
<command name="wrapper/install">
- <action class="org.apache.felix.karaf.shell.wrapper.InstallCommand"/>
+ <action class="org.apache.karaf.shell.wrapper.InstallCommand"/>
</command>
</command-bundle>
Modified: karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/all/karaf-wrapper.jar
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/all/karaf-wrapper.jar?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
Binary files - no diff available.
Modified: karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/linux/karaf-wrapper
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/linux/karaf-wrapper?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
Binary files - no diff available.
Modified: karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/linux/libwrapper.so
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/linux/libwrapper.so?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
Binary files - no diff available.
Modified: karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/macosx/karaf-wrapper
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/macosx/karaf-wrapper?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
Binary files - no diff available.
Modified: karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/macosx/libwrapper.jnilib
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/macosx/libwrapper.jnilib?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
Binary files - no diff available.
Modified: karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-wrapper.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-wrapper.conf?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-wrapper.conf (original)
+++ karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-wrapper.conf Tue Jun 29 07:45:00 2010
@@ -31,7 +31,7 @@ wrapper.java.classpath.3=%KARAF_HOME%/li
wrapper.java.library.path.1=%KARAF_BASE%/lib/
# Application Parameters. Add parameters as needed starting from 1
-wrapper.app.parameter.1=org.apache.felix.karaf.main.Bootstrap
+wrapper.app.parameter.1=org.apache.karaf.main.Bootstrap
# JVM Parameters
# note that n is the parameter number starting from 1.
Modified: karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/karaf-wrapper.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/karaf-wrapper.conf?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/karaf-wrapper.conf (original)
+++ karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/karaf-wrapper.conf Tue Jun 29 07:45:00 2010
@@ -31,7 +31,7 @@ wrapper.java.classpath.3=%KARAF_HOME%/li
wrapper.java.library.path.1=%KARAF_BASE%/lib/
# Application Parameters. Add parameters as needed starting from 1
-wrapper.app.parameter.1=org.apache.felix.karaf.main.Bootstrap
+wrapper.app.parameter.1=org.apache.karaf.main.Bootstrap
# JVM Parameters
# note that n is the parameter number starting from 1.
Modified: karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/karaf-wrapper.exe
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/karaf-wrapper.exe?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
Binary files - no diff available.
Modified: karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/wrapper.dll
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/wrapper.dll?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
Binary files - no diff available.
Modified: karaf/trunk/tooling/cmdhelp-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/cmdhelp-maven-plugin/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/cmdhelp-maven-plugin/pom.xml (original)
+++ karaf/trunk/tooling/cmdhelp-maven-plugin/pom.xml Tue Jun 29 07:45:00 2010
@@ -19,16 +19,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf.tooling</groupId>
+ <groupId>org.apache.karaf.tooling</groupId>
<artifactId>tooling</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.tooling</groupId>
+ <groupId>org.apache.karaf.tooling</groupId>
<artifactId>cmdhelp-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Maven2 Command Help plugin</name>
+ <name>Apache Karaf :: Maven2 Command Help plugin</name>
<description>
A Maven 2 plugin for extracting Karaf command helps into markup
@@ -52,8 +52,8 @@
<artifactId>maven-bundle-plugin</artifactId>
</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>
<dependency>
<groupId>org.slf4j</groupId>
Modified: karaf/trunk/tooling/cmdhelp-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/cmdhelp-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/cmdhelp-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java (original)
+++ karaf/trunk/tooling/cmdhelp-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java Tue Jun 29 07:45:00 2010
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.tooling.cmdhelp;
+package org.apache.karaf.tooling.cmdhelp;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -40,7 +40,7 @@ import org.apache.felix.gogo.commands.Ac
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.Option;
-import org.apache.felix.karaf.shell.console.commands.BlueprintCommand;
+import org.apache.karaf.shell.console.commands.BlueprintCommand;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
Modified: karaf/trunk/tooling/features-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/pom.xml (original)
+++ karaf/trunk/tooling/features-maven-plugin/pom.xml Tue Jun 29 07:45:00 2010
@@ -19,16 +19,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf.tooling</groupId>
+ <groupId>org.apache.karaf.tooling</groupId>
<artifactId>tooling</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.tooling</groupId>
+ <groupId>org.apache.karaf.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Maven2 Features plugin</name>
+ <name>Apache Karaf :: Maven2 Features plugin</name>
<description>
A Maven 2 plugin for working with feature descriptors
@@ -52,8 +52,8 @@
<artifactId>maven-bundle-plugin</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.features</groupId>
- <artifactId>org.apache.felix.karaf.features.core</artifactId>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.core</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Modified: karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java Tue Jun 29 07:45:00 2010
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.tooling.features;
+package org.apache.karaf.tooling.features;
import java.util.List;
import java.util.ArrayList;
Modified: karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesFileMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesFileMojo.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesFileMojo.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesFileMojo.java Tue Jun 29 07:45:00 2010
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.tooling.features;
+package org.apache.karaf.tooling.features;
import java.io.BufferedInputStream;
import java.io.File;
@@ -221,8 +221,8 @@ public class GenerateFeaturesFileMojo ex
}
}
- Artifact kernel = factory.createArtifact("org.apache.felix.karaf",
- "apache-felix-karaf",
+ Artifact kernel = factory.createArtifact("org.apache.karaf",
+ "apache-karaf",
karafVersion, Artifact.SCOPE_PROVIDED, "pom");
resolver.resolve(kernel, remoteRepos, localRepo);
getLog().info("-- List of bundles provided by Karaf " + karafVersion + " --");
Modified: karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java Tue Jun 29 07:45:00 2010
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.tooling.features;
+package org.apache.karaf.tooling.features;
import java.io.BufferedReader;
import java.io.File;
@@ -213,7 +213,7 @@ public class GenerateFeaturesXmlMojo ext
} else {
getLog().info("Step 1 : Building list of kernel exports");
getLog().warn("Use of 'kernelVersion' is deprecated -- use a dependency with scope 'provided' instead");
- Artifact kernel = factory.createArtifact("org.apache.felix.karaf", "apache-felix-karaf", kernelVersion, Artifact.SCOPE_PROVIDED, "pom");
+ Artifact kernel = factory.createArtifact("org.apache.karaf", "apache-karaf", kernelVersion, Artifact.SCOPE_PROVIDED, "pom");
resolver.resolve(kernel, remoteRepos, localRepo);
kernelArtifacts = getDependencies(kernel);
}
Modified: karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GraphArtifactCollector.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GraphArtifactCollector.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GraphArtifactCollector.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GraphArtifactCollector.java Tue Jun 29 07:45:00 2010
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.tooling.features;
+package org.apache.karaf.tooling.features;
import java.util.ArrayList;
import java.util.Collections;
Modified: karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ManifestUtils.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ManifestUtils.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ManifestUtils.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ManifestUtils.java Tue Jun 29 07:45:00 2010
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.tooling.features;
+package org.apache.karaf.tooling.features;
import java.util.LinkedList;
import java.util.List;
Modified: karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MojoSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MojoSupport.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MojoSupport.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MojoSupport.java Tue Jun 29 07:45:00 2010
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.tooling.features;
+package org.apache.karaf.tooling.features;
import java.io.File;
Modified: karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/Node.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/Node.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/Node.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/Node.java Tue Jun 29 07:45:00 2010
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.tooling.features;
+package org.apache.karaf.tooling.features;
import java.util.Set;
import java.util.HashSet;
Modified: karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ResolutionListenerImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ResolutionListenerImpl.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ResolutionListenerImpl.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ResolutionListenerImpl.java Tue Jun 29 07:45:00 2010
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.tooling.features;
+package org.apache.karaf.tooling.features;
import java.util.Collection;
import java.util.HashMap;
Modified: karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java Tue Jun 29 07:45:00 2010
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.tooling.features;
+package org.apache.karaf.tooling.features;
-import static org.apache.felix.karaf.tooling.features.ManifestUtils.getExports;
-import static org.apache.felix.karaf.tooling.features.ManifestUtils.getMandatoryImports;
-import static org.apache.felix.karaf.tooling.features.ManifestUtils.matches;
+import static org.apache.karaf.tooling.features.ManifestUtils.getExports;
+import static org.apache.karaf.tooling.features.ManifestUtils.getMandatoryImports;
+import static org.apache.karaf.tooling.features.ManifestUtils.matches;
import java.io.*;
import java.net.URI;
@@ -28,9 +28,9 @@ import java.util.jar.Manifest;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
-import org.apache.felix.karaf.features.Feature;
-import org.apache.felix.karaf.features.Repository;
-import org.apache.felix.karaf.features.internal.RepositoryImpl;
+import org.apache.karaf.features.Feature;
+import org.apache.karaf.features.Repository;
+import org.apache.karaf.features.internal.RepositoryImpl;
import org.apache.felix.utils.manifest.Clause;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
Modified: karaf/trunk/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesFileMojoTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesFileMojoTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesFileMojoTest.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesFileMojoTest.java Tue Jun 29 07:45:00 2010
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.tooling.features;
+package org.apache.karaf.tooling.features;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
Modified: karaf/trunk/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.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.tooling.features;
+package org.apache.karaf.tooling.features;
import org.apache.maven.artifact.Artifact;
import org.easymock.EasyMock;
@@ -31,13 +31,13 @@ public class GenerateFeaturesXmlMojoTest
public void testToString() throws Exception {
Artifact artifact = EasyMock.createMock(Artifact.class);
- expect(artifact.getGroupId()).andReturn("org.apache.felix.karaf.test");
+ expect(artifact.getGroupId()).andReturn("org.apache.karaf.test");
expect(artifact.getArtifactId()).andReturn("test-artifact");
expect(artifact.getVersion()).andReturn("1.2.3");
replay(artifact);
- assertEquals("org.apache.felix.karaf.test/test-artifact/1.2.3", GenerateFeaturesXmlMojo.toString(artifact));
+ assertEquals("org.apache.karaf.test/test-artifact/1.2.3", GenerateFeaturesXmlMojo.toString(artifact));
}
}
Modified: karaf/trunk/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/ManifestUtilsTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/ManifestUtilsTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/ManifestUtilsTest.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/ManifestUtilsTest.java Tue Jun 29 07:45:00 2010
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.tooling.features;
+package org.apache.karaf.tooling.features;
-import static org.apache.felix.karaf.tooling.features.ManifestUtils.matches;
+import static org.apache.karaf.tooling.features.ManifestUtils.matches;
import junit.framework.TestCase;
@@ -29,7 +29,7 @@ import org.apache.felix.utils.manifest.D
import org.osgi.framework.Constants;
/**
- * Test cased for {@link org.apache.felix.karaf.tooling.features.ManifestUtils}
+ * Test cased for {@link org.apache.karaf.tooling.features.ManifestUtils}
*/
public class ManifestUtilsTest extends TestCase {
Modified: karaf/trunk/tooling/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/pom.xml (original)
+++ karaf/trunk/tooling/pom.xml Tue Jun 29 07:45:00 2010
@@ -21,16 +21,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf</groupId>
+ <groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.tooling</groupId>
+ <groupId>org.apache.karaf.tooling</groupId>
<artifactId>tooling</artifactId>
<packaging>pom</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Tooling</name>
+ <name>Apache Karaf :: Tooling</name>
<modules>
<module>features-maven-plugin</module>
Modified: karaf/trunk/tooling/testing/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/testing/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/testing/pom.xml (original)
+++ karaf/trunk/tooling/testing/pom.xml Tue Jun 29 07:45:00 2010
@@ -19,16 +19,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf.tooling</groupId>
+ <groupId>org.apache.karaf.tooling</groupId>
<artifactId>tooling</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.tooling</groupId>
- <artifactId>org.apache.felix.karaf.tooling.testing</artifactId>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>org.apache.karaf.tooling.testing</artifactId>
<packaging>bundle</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Testing environment</name>
+ <name>Apache Karaf :: Testing environment</name>
<description>
A bundle to help using Pax-Exam and Karaf.
@@ -41,8 +41,8 @@
<dependencies>
<!-- The assembly and all the dependencies -->
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>apache-felix-karaf</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
@@ -126,15 +126,15 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.felix.karaf.testing;version=${project.version}</Export-Package>
+ <Export-Package>org.apache.karaf.testing;version=${project.version}</Export-Package>
<Import-Package>
- !org.apache.felix.karaf.testing*,
+ !org.apache.karaf.testing*,
*
</Import-Package>
<Include-Resource>
{maven-resources},
- org/apache/felix/karaf/testing/config.properties=target/classes/config.properties,
- org/apache/felix/karaf/testing/startup.properties=target/classes/startup.properties
+ org/apache/karaf/testing/config.properties=target/classes/config.properties,
+ org/apache/karaf/testing/startup.properties=target/classes/startup.properties
</Include-Resource>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
Modified: karaf/trunk/tooling/testing/src/main/java/org/apache/karaf/testing/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/testing/src/main/java/org/apache/karaf/testing/AbstractIntegrationTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/testing/src/main/java/org/apache/karaf/testing/AbstractIntegrationTest.java (original)
+++ karaf/trunk/tooling/testing/src/main/java/org/apache/karaf/testing/AbstractIntegrationTest.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.testing;
+package org.apache.karaf.testing;
import java.util.Collection;
import java.util.Dictionary;
@@ -33,7 +33,7 @@ import org.osgi.framework.InvalidSyntaxE
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
-import static org.apache.felix.karaf.testing.Helper.mavenBundle;
+import static org.apache.karaf.testing.Helper.mavenBundle;
public abstract class AbstractIntegrationTest {
@@ -134,4 +134,4 @@ public abstract class AbstractIntegratio
return result;
}
-}
\ No newline at end of file
+}
Modified: karaf/trunk/tooling/testing/src/main/java/org/apache/karaf/testing/Helper.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/testing/src/main/java/org/apache/karaf/testing/Helper.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/tooling/testing/src/main/java/org/apache/karaf/testing/Helper.java (original)
+++ karaf/trunk/tooling/testing/src/main/java/org/apache/karaf/testing/Helper.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.testing;
+package org.apache.karaf.testing;
import java.io.IOException;
import java.io.InputStream;
@@ -112,7 +112,7 @@ public final class Helper {
*/
public static Option[] getDefaultConfigOptions(SystemPropertyOption... sysOptions) {
return getDefaultConfigOptions(getDefaultSystemOptions(),
- getResource("/org/apache/felix/karaf/testing/config.properties"),
+ getResource("/org/apache/karaf/testing/config.properties"),
sysOptions);
}
@@ -180,7 +180,7 @@ public final class Helper {
*/
public static Option[] getDefaultProvisioningOptions() {
return getDefaultProvisioningOptions(getDefaultSystemOptions(),
- getResource("/org/apache/felix/karaf/testing/startup.properties"));
+ getResource("/org/apache/karaf/testing/startup.properties"));
}
/**
@@ -200,19 +200,19 @@ public final class Helper {
}
// Transform to sys props options
List<Option> options = new ArrayList<Option>();
- options.add(bootClasspathLibrary(mavenBundle("org.apache.felix.karaf.jaas", "org.apache.felix.karaf.jaas.boot")).afterFramework());
- options.add(bootClasspathLibrary(mavenBundle("org.apache.felix.karaf", "org.apache.felix.karaf.main")).afterFramework());
+ options.add(bootClasspathLibrary(mavenBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.boot")).afterFramework());
+ options.add(bootClasspathLibrary(mavenBundle("org.apache.karaf", "org.apache.karaf.main")).afterFramework());
for (Enumeration e = startupProps.propertyNames(); e.hasMoreElements();) {
String name = (String) e.nextElement();
String value = startupProps.getProperty(name);
MavenArtifactProvisionOption opt = convertToMaven(name);
- if (opt.getURL().contains("org.apache.felix.karaf.features")) {
+ if (opt.getURL().contains("org.apache.karaf.features")) {
opt.noStart();
}
opt.startLevel(Integer.parseInt(value));
options.add(opt);
}
- options.add(mavenBundle("org.apache.felix.karaf.tooling", "org.apache.felix.karaf.tooling.testing"));
+ options.add(mavenBundle("org.apache.karaf.tooling", "org.apache.karaf.tooling.testing"));
options.add(wrappedBundle(maven("org.ops4j.pax.exam", "pax-exam-container-default")));
// We need to add pax-exam-junit here when running with the ibm
// jdk to avoid the following exception during the test run:
Modified: karaf/trunk/webconsole/admin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/admin/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/webconsole/admin/pom.xml (original)
+++ karaf/trunk/webconsole/admin/pom.xml Tue Jun 29 07:45:00 2010
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf.webconsole</groupId>
+ <groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.webconsole</groupId>
- <artifactId>org.apache.felix.karaf.webconsole.admin</artifactId>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>org.apache.karaf.webconsole.admin</artifactId>
<packaging>bundle</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Web Console :: Admin Plugin</name>
+ <name>Apache Karaf :: Web Console :: Admin Plugin</name>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -59,8 +59,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.admin</groupId>
- <artifactId>org.apache.felix.karaf.admin.core</artifactId>
+ <groupId>org.apache.karaf.admin</groupId>
+ <artifactId>org.apache.karaf.admin.core</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java (original)
+++ karaf/trunk/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* limitations under the License.
* under the License.
*/
-package org.apache.felix.karaf.webconsole.admin;
+package org.apache.karaf.webconsole.admin;
import java.io.IOException;
import java.io.InputStream;
@@ -31,9 +31,9 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.felix.karaf.admin.AdminService;
-import org.apache.felix.karaf.admin.Instance;
-import org.apache.felix.karaf.admin.InstanceSettings;
+import org.apache.karaf.admin.AdminService;
+import org.apache.karaf.admin.Instance;
+import org.apache.karaf.admin.InstanceSettings;
import org.apache.felix.webconsole.AbstractWebConsolePlugin;
import org.json.JSONException;
import org.json.JSONWriter;
Modified: karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml (original)
+++ karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml Tue Jun 29 07:45:00 2010
@@ -20,9 +20,9 @@
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
- <reference id="adminService" interface="org.apache.felix.karaf.admin.AdminService" />
+ <reference id="adminService" interface="org.apache.karaf.admin.AdminService" />
- <bean id="adminPlugin" class="org.apache.felix.karaf.webconsole.admin.AdminPlugin" init-method="start" destroy-method="stop">
+ <bean id="adminPlugin" class="org.apache.karaf.webconsole.admin.AdminPlugin" init-method="start" destroy-method="stop">
<property name="adminService" ref="adminService" />
<property name="bundleContext" ref="blueprintBundleContext" />
</bean>
Modified: karaf/trunk/webconsole/admin/src/test/java/org/apache/karaf/webconsole/admin/AdminPluginTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/admin/src/test/java/org/apache/karaf/webconsole/admin/AdminPluginTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/webconsole/admin/src/test/java/org/apache/karaf/webconsole/admin/AdminPluginTest.java (original)
+++ karaf/trunk/webconsole/admin/src/test/java/org/apache/karaf/webconsole/admin/AdminPluginTest.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.webconsole.admin;
+package org.apache.karaf.webconsole.admin;
import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;
@@ -30,9 +30,9 @@ import javax.servlet.http.HttpServletRes
import junit.framework.TestCase;
-import org.apache.felix.karaf.admin.AdminService;
-import org.apache.felix.karaf.admin.Instance;
-import org.apache.felix.karaf.admin.InstanceSettings;
+import org.apache.karaf.admin.AdminService;
+import org.apache.karaf.admin.Instance;
+import org.apache.karaf.admin.InstanceSettings;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
Modified: karaf/trunk/webconsole/branding/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/branding/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/webconsole/branding/pom.xml (original)
+++ karaf/trunk/webconsole/branding/pom.xml Tue Jun 29 07:45:00 2010
@@ -21,18 +21,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf.webconsole</groupId>
+ <groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.webconsole</groupId>
- <artifactId>org.apache.felix.karaf.webconsole.branding</artifactId>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>org.apache.karaf.webconsole.branding</artifactId>
<packaging>bundle</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Web Console :: Branding</name>
+ <name>Apache Karaf :: Web Console :: Branding</name>
- <description>Apache Felix Karaf branding for the Apache Felix Web Console. This fragment
+ <description>Apache Karaf branding for the Apache Felix Web Console. This fragment
attaches to the org.apache.felix.webconsole bundle to provide branding
through the /META-INF/webconsole.properties.
</description>
@@ -59,7 +59,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-DocURL>http://felix.apache.org/site/apache-felix-karaf.html</Bundle-DocURL>
+ <Bundle-DocURL>http://felix.apache.org/site/apache-karaf.html</Bundle-DocURL>
<Fragment-Host>org.apache.felix.webconsole;bundle-version="[3,4)"</Fragment-Host>
<Export-Package>!*</Export-Package>
</instructions>
@@ -69,4 +69,4 @@
</build>
-</project>
\ No newline at end of file
+</project>
Modified: karaf/trunk/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java (original)
+++ karaf/trunk/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.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.webconsole;
+package org.apache.karaf.webconsole;
import java.io.IOException;
import javax.security.auth.Subject;
Modified: karaf/trunk/webconsole/branding/src/main/resources/META-INF/webconsole.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/branding/src/main/resources/META-INF/webconsole.properties?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/webconsole/branding/src/main/resources/META-INF/webconsole.properties (original)
+++ karaf/trunk/webconsole/branding/src/main/resources/META-INF/webconsole.properties Tue Jun 29 07:45:00 2010
@@ -21,10 +21,10 @@
#
# This file contains branding properties to overwrite the default
# branding of the Apache Felix Web Console when deployed in an
-# Apache Felix Karaf application.
+# Apache Karaf application.
-webconsole.product.name = Apache Felix Karaf
-webconsole.product.url = http://felix.apache.org/site/apache-felix-karaf.html
+webconsole.product.name = Apache Karaf
+webconsole.product.url = http://felix.apache.org/site/apache-karaf.html
webconsole.product.image = /res/karaf/imgs/logo.png
webconsole.vendor.name = The Apache Software Foundation
Modified: karaf/trunk/webconsole/branding/src/main/resources/OSGI-INF/blueprint/webconsole.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/branding/src/main/resources/OSGI-INF/blueprint/webconsole.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/webconsole/branding/src/main/resources/OSGI-INF/blueprint/webconsole.xml (original)
+++ karaf/trunk/webconsole/branding/src/main/resources/OSGI-INF/blueprint/webconsole.xml Tue Jun 29 07:45:00 2010
@@ -25,13 +25,13 @@
<ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]"/>
- <cm:property-placeholder persistent-id="org.apache.felix.karaf.webconsole">
+ <cm:property-placeholder persistent-id="org.apache.karaf.webconsole">
<cm:default-properties>
<cm:property name="realm" value="karaf"/>
</cm:default-properties>
</cm:property-placeholder>
- <bean id="securityProvider" class="org.apache.felix.karaf.webconsole.JaasSecurityProvider">
+ <bean id="securityProvider" class="org.apache.karaf.webconsole.JaasSecurityProvider">
<property name="realm" value="${realm}"/>
</bean>
Modified: karaf/trunk/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ karaf/trunk/webconsole/branding/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
-webconsole.name = Apache Felix Karaf WebConsole
-webconsole.description = Configuration of Apache Felix Karaf WebConsole
+webconsole.name = Apache Karaf WebConsole
+webconsole.description = Configuration of Apache Karaf WebConsole
realm.name = Realm
realm.description = The JAAS realm name to use for authentication
Modified: karaf/trunk/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.xml (original)
+++ karaf/trunk/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.xml Tue Jun 29 07:45:00 2010
@@ -18,10 +18,10 @@
-->
<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0" localization="OSGI-INF/metatype/metatype">
- <OCD id="org.apache.felix.karaf.webconsole" name="%webconsole.name" description="%webconsole.description">
+ <OCD id="org.apache.karaf.webconsole" name="%webconsole.name" description="%webconsole.description">
<AD id="realm" type="String" default="karaf" name="%realm.name" description="%realm.description"/>
</OCD>
- <Designate pid="org.apache.felix.karaf.webconsole">
- <Object ocdref="org.apache.felix.karaf.webconsole"/>
+ <Designate pid="org.apache.karaf.webconsole">
+ <Object ocdref="org.apache.karaf.webconsole"/>
</Designate>
</metatype:MetaData>
Modified: karaf/trunk/webconsole/branding/src/main/resources/res/karaf/imgs/favicon.ico
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/branding/src/main/resources/res/karaf/imgs/favicon.ico?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
Binary files - no diff available.
Modified: karaf/trunk/webconsole/branding/src/main/resources/res/karaf/imgs/logo.png
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/branding/src/main/resources/res/karaf/imgs/logo.png?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
Binary files - no diff available.
Modified: karaf/trunk/webconsole/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/pom.xml (original)
+++ karaf/trunk/webconsole/features/pom.xml Tue Jun 29 07:45:00 2010
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf.webconsole</groupId>
+ <groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.webconsole</groupId>
- <artifactId>org.apache.felix.karaf.webconsole.features</artifactId>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>org.apache.karaf.webconsole.features</artifactId>
<packaging>bundle</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Web Console :: Features Plugin</name>
+ <name>Apache Karaf :: Web Console :: Features Plugin</name>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -64,8 +64,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.features</groupId>
- <artifactId>org.apache.felix.karaf.features.core</artifactId>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
Modified: karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/ExtendedFeature.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/ExtendedFeature.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/ExtendedFeature.java (original)
+++ karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/ExtendedFeature.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.webconsole.features;
+package org.apache.karaf.webconsole.features;
import java.util.List;
import java.util.Map;
-import org.apache.felix.karaf.features.Feature;
+import org.apache.karaf.features.Feature;
/**
Modified: karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java (original)
+++ karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.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.webconsole.features;
+package org.apache.karaf.webconsole.features;
import java.io.IOException;
@@ -33,9 +33,9 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.felix.karaf.features.Feature;
-import org.apache.felix.karaf.features.FeaturesService;
-import org.apache.felix.karaf.features.Repository;
+import org.apache.karaf.features.Feature;
+import org.apache.karaf.features.FeaturesService;
+import org.apache.karaf.features.Repository;
import org.apache.felix.webconsole.AbstractWebConsolePlugin;
import org.json.JSONException;
import org.json.JSONWriter;
Modified: karaf/trunk/webconsole/features/src/main/resources/OSGI-INF/blueprint/webconsole-features.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/src/main/resources/OSGI-INF/blueprint/webconsole-features.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/src/main/resources/OSGI-INF/blueprint/webconsole-features.xml (original)
+++ karaf/trunk/webconsole/features/src/main/resources/OSGI-INF/blueprint/webconsole-features.xml Tue Jun 29 07:45:00 2010
@@ -20,9 +20,9 @@
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
- <reference id="featuresService" interface="org.apache.felix.karaf.features.FeaturesService" />
+ <reference id="featuresService" interface="org.apache.karaf.features.FeaturesService" />
- <bean id="featuresPlugin" class="org.apache.felix.karaf.webconsole.features.FeaturesPlugin" init-method="start" destroy-method="stop">
+ <bean id="featuresPlugin" class="org.apache.karaf.webconsole.features.FeaturesPlugin" init-method="start" destroy-method="stop">
<property name="featuresService" ref="featuresService" />
<property name="bundleContext" ref="blueprintBundleContext" />
</bean>
Modified: karaf/trunk/webconsole/gogo/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/pom.xml (original)
+++ karaf/trunk/webconsole/gogo/pom.xml Tue Jun 29 07:45:00 2010
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf.webconsole</groupId>
+ <groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.webconsole</groupId>
- <artifactId>org.apache.felix.karaf.webconsole.gogo</artifactId>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>org.apache.karaf.webconsole.gogo</artifactId>
<packaging>bundle</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Web Console :: Gogo Plugin</name>
+ <name>Apache Karaf :: Web Console :: Gogo Plugin</name>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -64,8 +64,8 @@
<scope>provided</scope>
</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>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
Modified: karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java (original)
+++ karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java Tue Jun 29 07:45:00 2010
@@ -20,7 +20,7 @@
* Public Domain License
*/
-package org.apache.felix.karaf.webconsole.gogo;
+package org.apache.karaf.webconsole.gogo;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -42,9 +42,9 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.felix.karaf.shell.console.Completer;
-import org.apache.felix.karaf.shell.console.completer.AggregateCompleter;
-import org.apache.felix.karaf.shell.console.jline.Console;
+import org.apache.karaf.shell.console.Completer;
+import org.apache.karaf.shell.console.completer.AggregateCompleter;
+import org.apache.karaf.shell.console.jline.Console;
import org.apache.felix.webconsole.AbstractWebConsolePlugin;
import org.osgi.framework.BundleContext;
import org.osgi.service.command.CommandProcessor;