Copied: felix/trunk/karaf/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/OSGI-INF/blueprint/gshell-osgi.xml) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml?p2=felix/trunk/karaf/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/OSGI-INF/blueprint/gshell-osgi.xml&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/OSGI-INF/blueprint/gshell-osgi.xml (original) +++ felix/trunk/karaf/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml Fri Sep 18 20:14:54 2009 @@ -19,18 +19,18 @@ --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";> - <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0";> + <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0";> <command name="osgi/bundle-level"> - <action class="org.apache.felix.karaf.gshell.osgi.BundleLevel"/> + <action class="org.apache.felix.karaf.shell.osgi.BundleLevel"/> </command> <command name="osgi/headers"> - <action class="org.apache.felix.karaf.gshell.osgi.Headers"/> + <action class="org.apache.felix.karaf.shell.osgi.Headers"/> </command> <command name="osgi/install"> - <action class="org.apache.felix.karaf.gshell.osgi.InstallBundle"/> + <action class="org.apache.felix.karaf.shell.osgi.InstallBundle"/> </command> <command name="osgi/list"> - <action class="org.apache.felix.karaf.gshell.osgi.ListBundles"> + <action class="org.apache.felix.karaf.shell.osgi.ListBundles"> <property name="bundleStateListenerFactories"> <list xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";> <ref component-id="blueprintListener" /> @@ -40,41 +40,41 @@ </action> </command> <command name="osgi/ls"> - <action class="org.apache.felix.karaf.gshell.osgi.ListServices"/> + <action class="org.apache.felix.karaf.shell.osgi.ListServices"/> </command> <command name="osgi/refresh"> - <action class="org.apache.felix.karaf.gshell.osgi.RefreshBundle"/> + <action class="org.apache.felix.karaf.shell.osgi.RefreshBundle"/> </command> <command name="osgi/update"> - <action class="org.apache.felix.karaf.gshell.osgi.UpdateBundle"/> + <action class="org.apache.felix.karaf.shell.osgi.UpdateBundle"/> </command> <command name="osgi/resolve"> - <action class="org.apache.felix.karaf.gshell.osgi.ResolveBundle"/> + <action class="org.apache.felix.karaf.shell.osgi.ResolveBundle"/> </command> <command name="osgi/restart"> - <action class="org.apache.felix.karaf.gshell.osgi.RestartBundle"/> + <action class="org.apache.felix.karaf.shell.osgi.RestartBundle"/> </command> <command name="osgi/shutdown"> - <action class="org.apache.felix.karaf.gshell.osgi.Shutdown"/> + <action class="org.apache.felix.karaf.shell.osgi.Shutdown"/> </command> <command name="osgi/start"> - <action class="org.apache.felix.karaf.gshell.osgi.StartBundle"/> + <action class="org.apache.felix.karaf.shell.osgi.StartBundle"/> </command> <command name="osgi/start-level"> - <action class="org.apache.felix.karaf.gshell.osgi.StartLevel"/> + <action class="org.apache.felix.karaf.shell.osgi.StartLevel"/> </command> <command name="osgi/stop"> - <action class="org.apache.felix.karaf.gshell.osgi.StopBundle"/> + <action class="org.apache.felix.karaf.shell.osgi.StopBundle"/> </command> <command name="osgi/uninstall"> - <action class="org.apache.felix.karaf.gshell.osgi.UninstallBundle"/> + <action class="org.apache.felix.karaf.shell.osgi.UninstallBundle"/> </command> </command-bundle> - <bean id="blueprintListener" class="org.apache.felix.karaf.gshell.osgi.BlueprintListener" /> + <bean id="blueprintListener" class="org.apache.felix.karaf.shell.osgi.BlueprintListener" /> <service ref="blueprintListener" interface="org.osgi.service.blueprint.container.BlueprintListener" /> - <bean id="springListener" class="org.apache.felix.karaf.gshell.osgi.SpringStateListenerFactory" destroy-method="destroy"> + <bean id="springListener" class="org.apache.felix.karaf.shell.osgi.SpringStateListenerFactory" destroy-method="destroy"> <property name="bundleContext" ref="blueprintBundleContext" /> </bean>
Copied: felix/trunk/karaf/shell/packages/pom.xml (from r816756, felix/trunk/karaf/gshell/gshell-packages/pom.xml) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/packages/pom.xml?p2=felix/trunk/karaf/shell/packages/pom.xml&p1=felix/trunk/karaf/gshell/gshell-packages/pom.xml&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-packages/pom.xml (original) +++ felix/trunk/karaf/shell/packages/pom.xml Fri Sep 18 20:14:54 2009 @@ -22,25 +22,25 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.felix.karaf.gshell</groupId> - <artifactId>gshell</artifactId> + <groupId>org.apache.felix.karaf.shell</groupId> + <artifactId>shell</artifactId> <version>0.9.0-SNAPSHOT</version> </parent> - <groupId>org.apache.felix.karaf.gshell</groupId> - <artifactId>org.apache.felix.karaf.gshell.packages</artifactId> + <groupId>org.apache.felix.karaf.shell</groupId> + <artifactId>org.apache.felix.karaf.shell.packages</artifactId> <packaging>bundle</packaging> <version>0.9.0-SNAPSHOT</version> - <name>Apache Felix Karaf :: GShell PackageAdmin Commands</name> + <name>Apache Felix Karaf :: Shell PackageAdmin Commands</name> <description> - Provides the PackageAdmin GShell commands + Provides the PackageAdmin Shell commands </description> <dependencies> <dependency> - <groupId>org.apache.felix.karaf.gshell</groupId> - <artifactId>org.apache.felix.karaf.gshell.console</artifactId> + <groupId>org.apache.felix.karaf.shell</groupId> + <artifactId>org.apache.felix.karaf.shell.console</artifactId> </dependency> <dependency> @@ -68,7 +68,7 @@ <Import-Package> org.osgi.service.command, org.apache.felix.gogo.commands, - org.apache.felix.karaf.gshell.console, + org.apache.felix.karaf.shell.console, * </Import-Package> <Private-Package>!*</Private-Package> Copied: felix/trunk/karaf/shell/packages/src/main/java/org/apache/felix/karaf/shell/packages/ExportsCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ExportsCommand.java) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/packages/src/main/java/org/apache/felix/karaf/shell/packages/ExportsCommand.java?p2=felix/trunk/karaf/shell/packages/src/main/java/org/apache/felix/karaf/shell/packages/ExportsCommand.java&p1=felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ExportsCommand.java&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ExportsCommand.java (original) +++ felix/trunk/karaf/shell/packages/src/main/java/org/apache/felix/karaf/shell/packages/ExportsCommand.java Fri Sep 18 20:14:54 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.felix.karaf.gshell.packages; +package org.apache.felix.karaf.shell.packages; import java.io.PrintStream; import java.util.List; Copied: felix/trunk/karaf/shell/packages/src/main/java/org/apache/felix/karaf/shell/packages/ImportsCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ImportsCommand.java) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/packages/src/main/java/org/apache/felix/karaf/shell/packages/ImportsCommand.java?p2=felix/trunk/karaf/shell/packages/src/main/java/org/apache/felix/karaf/shell/packages/ImportsCommand.java&p1=felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ImportsCommand.java&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ImportsCommand.java (original) +++ felix/trunk/karaf/shell/packages/src/main/java/org/apache/felix/karaf/shell/packages/ImportsCommand.java Fri Sep 18 20:14:54 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.felix.karaf.gshell.packages; +package org.apache.felix.karaf.shell.packages; import java.io.PrintStream; import java.util.ArrayList; Copied: felix/trunk/karaf/shell/packages/src/main/java/org/apache/felix/karaf/shell/packages/PackageCommandSupport.java (from r816756, felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/PackageCommandSupport.java) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/packages/src/main/java/org/apache/felix/karaf/shell/packages/PackageCommandSupport.java?p2=felix/trunk/karaf/shell/packages/src/main/java/org/apache/felix/karaf/shell/packages/PackageCommandSupport.java&p1=felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/PackageCommandSupport.java&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/PackageCommandSupport.java (original) +++ felix/trunk/karaf/shell/packages/src/main/java/org/apache/felix/karaf/shell/packages/PackageCommandSupport.java Fri Sep 18 20:14:54 2009 @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.felix.karaf.gshell.packages; +package org.apache.felix.karaf.shell.packages; -import org.apache.felix.karaf.gshell.console.OsgiCommandSupport; +import org.apache.felix.karaf.shell.console.OsgiCommandSupport; import org.osgi.framework.ServiceReference; import org.osgi.service.packageadmin.PackageAdmin; Copied: felix/trunk/karaf/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml (from r816756, felix/trunk/karaf/gshell/gshell-packages/src/main/resources/OSGI-INF/blueprint/gshell-packages.xml) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml?p2=felix/trunk/karaf/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml&p1=felix/trunk/karaf/gshell/gshell-packages/src/main/resources/OSGI-INF/blueprint/gshell-packages.xml&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-packages/src/main/resources/OSGI-INF/blueprint/gshell-packages.xml (original) +++ felix/trunk/karaf/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml Fri Sep 18 20:14:54 2009 @@ -19,12 +19,12 @@ --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";> - <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0";> + <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0";> <command name="packages/exports"> - <action class="org.apache.felix.karaf.gshell.packages.ExportsCommand"/> + <action class="org.apache.felix.karaf.shell.packages.ExportsCommand"/> </command> <command name="packages/imports"> - <action class="org.apache.felix.karaf.gshell.packages.ImportsCommand"/> + <action class="org.apache.felix.karaf.shell.packages.ImportsCommand"/> </command> </command-bundle> Copied: felix/trunk/karaf/shell/pom.xml (from r816756, felix/trunk/karaf/gshell/pom.xml) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/pom.xml?p2=felix/trunk/karaf/shell/pom.xml&p1=felix/trunk/karaf/gshell/pom.xml&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/pom.xml (original) +++ felix/trunk/karaf/shell/pom.xml Fri Sep 18 20:14:54 2009 @@ -27,23 +27,23 @@ <version>0.9.0-SNAPSHOT</version> </parent> - <groupId>org.apache.felix.karaf.gshell</groupId> - <artifactId>gshell</artifactId> + <groupId>org.apache.felix.karaf.shell</groupId> + <artifactId>shell</artifactId> <packaging>pom</packaging> <version>0.9.0-SNAPSHOT</version> - <name>Apache Felix Karaf :: GShell</name> + <name>Apache Felix Karaf :: Shell</name> <modules> - <module>gshell-console</module> - <module>gshell-osgi</module> - <module>gshell-admin</module> - <module>gshell-obr</module> - <module>gshell-wrapper</module> - <module>gshell-log</module> - <module>gshell-config</module> - <module>gshell-packages</module> - <module>gshell-ssh</module> - <module>gshell-commands</module> + <module>admin</module> + <module>commands</module> + <module>config</module> + <module>console</module> + <module>log</module> + <module>obr</module> + <module>osgi</module> + <module>packages</module> + <module>ssh</module> + <module>wrapper</module> </modules> </project> Copied: felix/trunk/karaf/shell/src/test/configs/services/org.apache.servicemix.shell.properties (from r816756, felix/trunk/karaf/gshell/src/test/configs/services/org.apache.servicemix.shell.properties) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/src/test/configs/services/org.apache.servicemix.shell.properties?p2=felix/trunk/karaf/shell/src/test/configs/services/org.apache.servicemix.shell.properties&p1=felix/trunk/karaf/gshell/src/test/configs/services/org.apache.servicemix.shell.properties&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== (empty) Copied: felix/trunk/karaf/shell/src/test/configs/services/org.ops4j.pax.logging.properties (from r816756, felix/trunk/karaf/gshell/src/test/configs/services/org.ops4j.pax.logging.properties) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/src/test/configs/services/org.ops4j.pax.logging.properties?p2=felix/trunk/karaf/shell/src/test/configs/services/org.ops4j.pax.logging.properties&p1=felix/trunk/karaf/gshell/src/test/configs/services/org.ops4j.pax.logging.properties&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/src/test/configs/services/org.ops4j.pax.logging.properties (original) +++ felix/trunk/karaf/shell/src/test/configs/services/org.ops4j.pax.logging.properties Fri Sep 18 20:14:54 2009 @@ -30,5 +30,5 @@ log4j.appender.out=org.apache.log4j.FileAppender log4j.appender.out.layout=org.apache.log4j.PatternLayout log4j.appender.out.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n -log4j.appender.out.file=target/gshell.log +log4j.appender.out.file=target/shell.log log4j.appender.out.append=true Copied: felix/trunk/karaf/shell/ssh/pom.xml (from r816756, felix/trunk/karaf/gshell/gshell-ssh/pom.xml) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/pom.xml?p2=felix/trunk/karaf/shell/ssh/pom.xml&p1=felix/trunk/karaf/gshell/gshell-ssh/pom.xml&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-ssh/pom.xml (original) +++ felix/trunk/karaf/shell/ssh/pom.xml Fri Sep 18 20:14:54 2009 @@ -22,16 +22,16 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.felix.karaf.gshell</groupId> - <artifactId>gshell</artifactId> + <groupId>org.apache.felix.karaf.shell</groupId> + <artifactId>shell</artifactId> <version>0.9.0-SNAPSHOT</version> </parent> - <groupId>org.apache.felix.karaf.gshell</groupId> - <artifactId>org.apache.felix.karaf.gshell.ssh</artifactId> + <groupId>org.apache.felix.karaf.shell</groupId> + <artifactId>org.apache.felix.karaf.shell.ssh</artifactId> <packaging>bundle</packaging> <version>0.9.0-SNAPSHOT</version> - <name>Apache Felix Karaf :: GShell SSH</name> + <name>Apache Felix Karaf :: Shell SSH</name> <description> Provides SSH support to the console @@ -39,8 +39,8 @@ <dependencies> <dependency> - <groupId>org.apache.felix.karaf.gshell</groupId> - <artifactId>org.apache.felix.karaf.gshell.console</artifactId> + <groupId>org.apache.felix.karaf.shell</groupId> + <artifactId>org.apache.felix.karaf.shell.console</artifactId> </dependency> <dependency> @@ -87,7 +87,7 @@ <Import-Package> org.osgi.service.command, org.apache.felix.gogo.commands, - org.apache.felix.karaf.gshell.console, + org.apache.felix.karaf.shell.console, org.apache.sshd.server.keyprovider, org.apache.sshd.server.jaas, * Copied: felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/ShellCommandFactory.java (from r816756, felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/ShellCommandFactory.java) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/ShellCommandFactory.java?p2=felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/ShellCommandFactory.java&p1=felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/ShellCommandFactory.java&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/ShellCommandFactory.java (original) +++ felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/ShellCommandFactory.java Fri Sep 18 20:14:54 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.karaf.gshell.ssh; +package org.apache.felix.karaf.shell.ssh; import java.io.Closeable; import java.io.IOException; Copied: felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/ShellFactoryImpl.java (from r816756, felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/ShellFactoryImpl.java) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/ShellFactoryImpl.java?p2=felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/ShellFactoryImpl.java&p1=felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/ShellFactoryImpl.java&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/ShellFactoryImpl.java (original) +++ felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/ShellFactoryImpl.java Fri Sep 18 20:14:54 2009 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.felix.karaf.gshell.ssh; +package org.apache.felix.karaf.shell.ssh; import java.io.Closeable; import java.io.IOException; @@ -27,15 +27,15 @@ import java.util.List; import java.util.Map; -import org.apache.felix.karaf.gshell.console.Completer; -import org.apache.felix.karaf.gshell.console.completer.AggregateCompleter; -import org.apache.felix.karaf.gshell.console.jline.Console; +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.sshd.server.ShellFactory; import org.osgi.service.command.CommandProcessor; import org.osgi.service.command.CommandSession; /** - * SSHD {...@link org.apache.sshd.server.ShellFactory} which provides access to GShell. + * SSHD {...@link org.apache.sshd.server.ShellFactory} which provides access to Shell. * * @version $Rev: 731517 $ $Date: 2009-01-05 11:25:19 +0100 (Mon, 05 Jan 2009) $ */ Copied: felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshAction.java (from r816756, felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/SshAction.java) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshAction.java?p2=felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshAction.java&p1=felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/SshAction.java&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/SshAction.java (original) +++ felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshAction.java Fri Sep 18 20:14:54 2009 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.felix.karaf.gshell.ssh; +package org.apache.felix.karaf.shell.ssh; import java.io.IOException; @@ -27,8 +27,8 @@ 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.gshell.console.OsgiCommandSupport; -import org.apache.felix.karaf.gshell.console.BlueprintContainerAware; +import org.apache.felix.karaf.shell.console.OsgiCommandSupport; +import org.apache.felix.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; Copied: felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshServerAction.java (from r816756, felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/SshServerAction.java) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshServerAction.java?p2=felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshServerAction.java&p1=felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/SshServerAction.java&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/SshServerAction.java (original) +++ felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshServerAction.java Fri Sep 18 20:14:54 2009 @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.felix.karaf.gshell.ssh; +package org.apache.felix.karaf.shell.ssh; import org.apache.sshd.SshServer; -import org.apache.felix.karaf.gshell.console.BlueprintContainerAware; -import org.apache.felix.karaf.gshell.console.OsgiCommandSupport; +import org.apache.felix.karaf.shell.console.BlueprintContainerAware; +import org.apache.felix.karaf.shell.console.OsgiCommandSupport; import org.apache.felix.gogo.commands.Option; import org.apache.felix.gogo.commands.Command; import org.slf4j.Logger; Copied: felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshServerFactory.java (from r816756, felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/SshServerFactory.java) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshServerFactory.java?p2=felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshServerFactory.java&p1=felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/SshServerFactory.java&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/SshServerFactory.java (original) +++ felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshServerFactory.java Fri Sep 18 20:14:54 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.karaf.gshell.ssh; +package org.apache.felix.karaf.shell.ssh; import org.apache.sshd.SshServer; Copied: felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshTerminal.java (from r816756, felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/SshTerminal.java) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshTerminal.java?p2=felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshTerminal.java&p1=felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/SshTerminal.java&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-ssh/src/main/java/org/apache/felix/karaf/gshell/ssh/SshTerminal.java (original) +++ felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshTerminal.java Fri Sep 18 20:14:54 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.karaf.gshell.ssh; +package org.apache.felix.karaf.shell.ssh; import java.io.InputStream; import java.io.IOException; Copied: felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml (from r816756, felix/trunk/karaf/gshell/gshell-ssh/src/main/resources/OSGI-INF/blueprint/gshell-ssh.xml) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml?p2=felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml&p1=felix/trunk/karaf/gshell/gshell-ssh/src/main/resources/OSGI-INF/blueprint/gshell-ssh.xml&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-ssh/src/main/resources/OSGI-INF/blueprint/gshell-ssh.xml (original) +++ felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml Fri Sep 18 20:14:54 2009 @@ -33,16 +33,16 @@ </cm:default-properties> </cm:property-placeholder> - <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0";> + <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0";> <command name="ssh/ssh"> - <action class="org.apache.felix.karaf.gshell.ssh.SshAction"> + <action class="org.apache.felix.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.gshell.ssh.SshServerAction"> + <action class="org.apache.felix.karaf.shell.ssh.SshServerAction"> <property name="sshServerId"> <bp:idref component-id="sshServer"/> </property> @@ -56,7 +56,7 @@ <bean id="sshServer" class="org.apache.sshd.SshServer" factory-method="setUpDefaultServer" scope="prototype"> <property name="port" value="${sshPort}"/> <property name="shellFactory"> - <bean class="org.apache.felix.karaf.gshell.ssh.ShellFactoryImpl"> + <bean class="org.apache.felix.karaf.shell.ssh.ShellFactoryImpl"> <property name="completers"> <list> <ref component-id="commandCompleter"/> @@ -66,7 +66,7 @@ </bean> </property> <property name="commandFactory"> - <bean class="org.apache.felix.karaf.gshell.ssh.ShellCommandFactory"> + <bean class="org.apache.felix.karaf.shell.ssh.ShellCommandFactory"> <property name="commandProcessor" ref="commandProcessor"/> </bean> </property> @@ -81,7 +81,7 @@ <property name="domain" value="${sshRealm}"/> </bean> - <bean id="sshServerFactory" class="org.apache.felix.karaf.gshell.ssh.SshServerFactory" init-method="start" + <bean id="sshServerFactory" class="org.apache.felix.karaf.shell.ssh.SshServerFactory" init-method="start" destroy-method="stop" activation="eager"> <argument ref="sshServer"/> <property name="start" value="$[karaf.startRemoteShell]"/> @@ -97,7 +97,7 @@ unbind-method="unregister"/> </reference-list> - <bean id="commandCompleter" class="org.apache.felix.karaf.gshell.console.completer.CommandsCompleter"> + <bean id="commandCompleter" class="org.apache.felix.karaf.shell.console.completer.CommandsCompleter"> <property name="bundleContext" ref="blueprintBundleContext" /> </bean> Copied: felix/trunk/karaf/shell/wrapper/pom.xml (from r816756, felix/trunk/karaf/gshell/gshell-wrapper/pom.xml) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/pom.xml?p2=felix/trunk/karaf/shell/wrapper/pom.xml&p1=felix/trunk/karaf/gshell/gshell-wrapper/pom.xml&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-wrapper/pom.xml (original) +++ felix/trunk/karaf/shell/wrapper/pom.xml Fri Sep 18 20:14:54 2009 @@ -22,25 +22,25 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.felix.karaf.gshell</groupId> - <artifactId>gshell</artifactId> + <groupId>org.apache.felix.karaf.shell</groupId> + <artifactId>shell</artifactId> <version>0.9.0-SNAPSHOT</version> </parent> - <groupId>org.apache.felix.karaf.gshell</groupId> - <artifactId>org.apache.felix.karaf.gshell.wrapper</artifactId> + <groupId>org.apache.felix.karaf.shell</groupId> + <artifactId>org.apache.felix.karaf.shell.wrapper</artifactId> <packaging>bundle</packaging> <version>0.9.0-SNAPSHOT</version> - <name>Apache Felix Karaf :: GShell Service Wrapper</name> + <name>Apache Felix Karaf :: Shell Service Wrapper</name> <description> - Provides the Service Wrapper GShell integration + Provides the Service Wrapper Shell integration </description> <dependencies> <dependency> - <groupId>org.apache.felix.karaf.gshell</groupId> - <artifactId>org.apache.felix.karaf.gshell.console</artifactId> + <groupId>org.apache.felix.karaf.shell</groupId> + <artifactId>org.apache.felix.karaf.shell.console</artifactId> </dependency> <dependency> @@ -84,7 +84,7 @@ <Import-Package> org.osgi.service.command, org.apache.felix.gogo.commands, - org.apache.felix.karaf.gshell.console, + org.apache.felix.karaf.shell.console, * </Import-Package> <Private-Package>!*</Private-Package> Copied: felix/trunk/karaf/shell/wrapper/src/main/java/org/apache/felix/karaf/shell/wrapper/InstallCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-wrapper/src/main/java/org/apache/felix/karaf/gshell/wrapper/InstallCommand.java) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/src/main/java/org/apache/felix/karaf/shell/wrapper/InstallCommand.java?p2=felix/trunk/karaf/shell/wrapper/src/main/java/org/apache/felix/karaf/shell/wrapper/InstallCommand.java&p1=felix/trunk/karaf/gshell/gshell-wrapper/src/main/java/org/apache/felix/karaf/gshell/wrapper/InstallCommand.java&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-wrapper/src/main/java/org/apache/felix/karaf/gshell/wrapper/InstallCommand.java (original) +++ felix/trunk/karaf/shell/wrapper/src/main/java/org/apache/felix/karaf/shell/wrapper/InstallCommand.java Fri Sep 18 20:14:54 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.felix.karaf.gshell.wrapper; +package org.apache.felix.karaf.shell.wrapper; import java.io.File; import java.io.FileOutputStream; @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Scanner; -import org.apache.felix.karaf.gshell.console.OsgiCommandSupport; +import org.apache.felix.karaf.shell.console.OsgiCommandSupport; import org.apache.felix.gogo.commands.Option; import org.apache.felix.gogo.commands.Command; import org.fusesource.jansi.Ansi; Copied: felix/trunk/karaf/shell/wrapper/src/main/java/org/apache/felix/karaf/shell/wrapper/PumpStreamHandler.java (from r816756, felix/trunk/karaf/gshell/gshell-wrapper/src/main/java/org/apache/felix/karaf/gshell/wrapper/PumpStreamHandler.java) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/src/main/java/org/apache/felix/karaf/shell/wrapper/PumpStreamHandler.java?p2=felix/trunk/karaf/shell/wrapper/src/main/java/org/apache/felix/karaf/shell/wrapper/PumpStreamHandler.java&p1=felix/trunk/karaf/gshell/gshell-wrapper/src/main/java/org/apache/felix/karaf/gshell/wrapper/PumpStreamHandler.java&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-wrapper/src/main/java/org/apache/felix/karaf/gshell/wrapper/PumpStreamHandler.java (original) +++ felix/trunk/karaf/shell/wrapper/src/main/java/org/apache/felix/karaf/shell/wrapper/PumpStreamHandler.java Fri Sep 18 20:14:54 2009 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.felix.karaf.gshell.wrapper; +package org.apache.felix.karaf.shell.wrapper; import java.io.InputStream; import java.io.OutputStream; Copied: felix/trunk/karaf/shell/wrapper/src/main/java/org/apache/felix/karaf/shell/wrapper/StreamPumper.java (from r816756, felix/trunk/karaf/gshell/gshell-wrapper/src/main/java/org/apache/felix/karaf/gshell/wrapper/StreamPumper.java) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/src/main/java/org/apache/felix/karaf/shell/wrapper/StreamPumper.java?p2=felix/trunk/karaf/shell/wrapper/src/main/java/org/apache/felix/karaf/shell/wrapper/StreamPumper.java&p1=felix/trunk/karaf/gshell/gshell-wrapper/src/main/java/org/apache/felix/karaf/gshell/wrapper/StreamPumper.java&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-wrapper/src/main/java/org/apache/felix/karaf/gshell/wrapper/StreamPumper.java (original) +++ felix/trunk/karaf/shell/wrapper/src/main/java/org/apache/felix/karaf/shell/wrapper/StreamPumper.java Fri Sep 18 20:14:54 2009 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.felix.karaf.gshell.wrapper; +package org.apache.felix.karaf.shell.wrapper; import java.io.InputStream; import java.io.OutputStream; Copied: felix/trunk/karaf/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml (from r816756, felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/OSGI-INF/blueprint/gshell-wrapper.xml) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml?p2=felix/trunk/karaf/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml&p1=felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/OSGI-INF/blueprint/gshell-wrapper.xml&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/OSGI-INF/blueprint/gshell-wrapper.xml (original) +++ felix/trunk/karaf/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml Fri Sep 18 20:14:54 2009 @@ -19,9 +19,9 @@ --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";> - <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0";> + <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0";> <command name="wrapper/install"> - <action class="org.apache.felix.karaf.gshell.wrapper.InstallCommand"/> + <action class="org.apache.felix.karaf.shell.wrapper.InstallCommand"/> </command> </command-bundle> Copied: felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/all/karaf-wrapper.conf (from r816756, felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/all/karaf-wrapper.conf) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/all/karaf-wrapper.conf?p2=felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/all/karaf-wrapper.conf&p1=felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/all/karaf-wrapper.conf&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== (empty) Copied: felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/all/karaf-wrapper.jar (from r816756, felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/all/karaf-wrapper.jar) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/all/karaf-wrapper.jar?p2=felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/all/karaf-wrapper.jar&p1=felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/all/karaf-wrapper.jar&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== Binary files - no diff available. Copied: felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/linux/karaf-wrapper (from r816756, felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/linux/karaf-wrapper) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/linux/karaf-wrapper?p2=felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/linux/karaf-wrapper&p1=felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/linux/karaf-wrapper&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== Binary files - no diff available. Copied: felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/linux/libwrapper.so (from r816756, felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/linux/libwrapper.so) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/linux/libwrapper.so?p2=felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/linux/libwrapper.so&p1=felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/linux/libwrapper.so&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== Binary files - no diff available. Copied: felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/macosx/karaf-wrapper (from r816756, felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/macosx/karaf-wrapper) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/macosx/karaf-wrapper?p2=felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/macosx/karaf-wrapper&p1=felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/macosx/karaf-wrapper&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== Binary files - no diff available. Copied: felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/macosx/libwrapper.jnilib (from r816756, felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/macosx/libwrapper.jnilib) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/macosx/libwrapper.jnilib?p2=felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/macosx/libwrapper.jnilib&p1=felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/macosx/libwrapper.jnilib&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== Binary files - no diff available. Copied: felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/unix/karaf-service (from r816756, felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/unix/karaf-service) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/unix/karaf-service?p2=felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/unix/karaf-service&p1=felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/unix/karaf-service&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== (empty) Copied: felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/windows/karaf-service.bat (from r816756, felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/windows/karaf-service.bat) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/windows/karaf-service.bat?p2=felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/windows/karaf-service.bat&p1=felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/windows/karaf-service.bat&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== (empty) Copied: felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/windows/karaf-wrapper.exe (from r816756, felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/windows/karaf-wrapper.exe) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/windows/karaf-wrapper.exe?p2=felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/windows/karaf-wrapper.exe&p1=felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/windows/karaf-wrapper.exe&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== Binary files - no diff available. Copied: felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/windows/wrapper.dll (from r816756, felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/windows/wrapper.dll) URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/windows/wrapper.dll?p2=felix/trunk/karaf/shell/wrapper/src/main/resources/org/apache/felix/karaf/shell/wrapper/windows/wrapper.dll&p1=felix/trunk/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/windows/wrapper.dll&r1=816756&r2=816769&rev=816769&view=diff ============================================================================== Binary files - no diff available. Modified: felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesFileMojo.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesFileMojo.java?rev=816769&r1=816768&r2=816769&view=diff ============================================================================== --- felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesFileMojo.java (original) +++ felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesFileMojo.java Fri Sep 18 20:14:54 2009 @@ -118,7 +118,7 @@ * * @parameter */ - private String kernelVersion; + private String karafVersion; /** * A properties file containing bundle translations @@ -223,9 +223,9 @@ Artifact kernel = factory.createArtifact("org.apache.felix.karaf", "apache-felix-karaf", - kernelVersion, Artifact.SCOPE_PROVIDED, "pom"); + karafVersion, Artifact.SCOPE_PROVIDED, "pom"); resolver.resolve(kernel, remoteRepos, localRepo); - getLog().info("-- List of bundles provided by ServiceMix Kernel " + kernelVersion + " --"); + getLog().info("-- List of bundles provided by Karaf " + karafVersion + " --"); for (Artifact artifact : getDependencies(kernel)) { getLog().info(" " + artifact); provided.add(artifact); Modified: felix/trunk/karaf/webconsole/admin/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/admin/pom.xml?rev=816769&r1=816768&r2=816769&view=diff ============================================================================== --- felix/trunk/karaf/webconsole/admin/pom.xml (original) +++ felix/trunk/karaf/webconsole/admin/pom.xml Fri Sep 18 20:14:54 2009 @@ -55,8 +55,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.felix.karaf.gshell</groupId> - <artifactId>org.apache.felix.karaf.gshell.admin</artifactId> + <groupId>org.apache.felix.karaf.shell</groupId> + <artifactId>org.apache.felix.karaf.shell.admin</artifactId> <version>0.9.0-SNAPSHOT</version> <scope>provided</scope> </dependency> Modified: felix/trunk/karaf/webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/AdminPlugin.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/AdminPlugin.java?rev=816769&r1=816768&r2=816769&view=diff ============================================================================== --- felix/trunk/karaf/webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/AdminPlugin.java (original) +++ felix/trunk/karaf/webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/AdminPlugin.java Fri Sep 18 20:14:54 2009 @@ -25,8 +25,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.felix.karaf.gshell.admin.AdminService; -import org.apache.felix.karaf.gshell.admin.Instance; +import org.apache.felix.karaf.shell.admin.AdminService; +import org.apache.felix.karaf.shell.admin.Instance; import org.apache.felix.webconsole.AbstractWebConsolePlugin; import org.json.JSONException; import org.osgi.framework.BundleContext; Modified: felix/trunk/karaf/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml?rev=816769&r1=816768&r2=816769&view=diff ============================================================================== --- felix/trunk/karaf/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml (original) +++ felix/trunk/karaf/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml Fri Sep 18 20:14:54 2009 @@ -20,7 +20,7 @@ <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; xmlns:cm="http://geronimo.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0";> - <reference id="adminService" interface="org.apache.felix.karaf.gshell.admin.AdminService" /> + <reference id="adminService" interface="org.apache.felix.karaf.shell.admin.AdminService" /> <bean id="adminPlugin" class="org.apache.felix.karaf.webconsole.admin.AdminPlugin" init-method="start" destroy-method="stop"> <property name="adminService" ref="adminService" /> Modified: felix/trunk/karaf/webconsole/features/src/main/java/org/apache/felix/karaf/webconsole/features/FeaturesPlugin.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/features/src/main/java/org/apache/felix/karaf/webconsole/features/FeaturesPlugin.java?rev=816769&r1=816768&r2=816769&view=diff ============================================================================== --- felix/trunk/karaf/webconsole/features/src/main/java/org/apache/felix/karaf/webconsole/features/FeaturesPlugin.java (original) +++ felix/trunk/karaf/webconsole/features/src/main/java/org/apache/felix/karaf/webconsole/features/FeaturesPlugin.java Fri Sep 18 20:14:54 2009 @@ -221,7 +221,7 @@ boolean success = false; if ( featuresService == null ) { - this.log.error( "GShell Features service is unavailable." ); + this.log.error( "Shell Features service is unavailable." ); } try { @@ -240,7 +240,7 @@ boolean success = false; if ( featuresService == null ) { - this.log.error( "GShell Features service is unavailable." ); + this.log.error( "Shell Features service is unavailable." ); } try { @@ -259,7 +259,7 @@ boolean success = false; if ( featuresService == null ) { - this.log.error( "GShell Features service is unavailable." ); + this.log.error( "Shell Features service is unavailable." ); } try { @@ -278,7 +278,7 @@ boolean success = false; if ( featuresService == null ) { - this.log.error( "GShell Features service is unavailable." ); + this.log.error( "Shell Features service is unavailable." ); } try { @@ -298,7 +298,7 @@ boolean success = false; if ( featuresService == null ) { - this.log.error( "GShell Features service is unavailable." ); + this.log.error( "Shell Features service is unavailable." ); } try { @@ -386,7 +386,7 @@ if ( featuresService == null ) { - this.log.error( "GShell Features service is unavailable." ); + this.log.error( "Shell Features service is unavailable." ); return repositories; } @@ -411,7 +411,7 @@ if ( featuresService == null ) { - this.log.error( "GShell Features service is unavailable." ); + this.log.error( "Shell Features service is unavailable." ); return features; } Modified: felix/trunk/karaf/webconsole/gogo/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/gogo/pom.xml?rev=816769&r1=816768&r2=816769&view=diff ============================================================================== --- felix/trunk/karaf/webconsole/gogo/pom.xml (original) +++ felix/trunk/karaf/webconsole/gogo/pom.xml Fri Sep 18 20:14:54 2009 @@ -61,8 +61,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.felix.karaf.gshell</groupId> - <artifactId>org.apache.felix.karaf.gshell.console</artifactId> + <groupId>org.apache.felix.karaf.shell</groupId> + <artifactId>org.apache.felix.karaf.shell.console</artifactId> </dependency> <dependency> <groupId>org.apache.servicemix.bundles</groupId> Modified: felix/trunk/karaf/webconsole/gogo/src/main/java/org/apache/felix/karaf/webconsole/gogo/GogoPlugin.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/gogo/src/main/java/org/apache/felix/karaf/webconsole/gogo/GogoPlugin.java?rev=816769&r1=816768&r2=816769&view=diff ============================================================================== --- felix/trunk/karaf/webconsole/gogo/src/main/java/org/apache/felix/karaf/webconsole/gogo/GogoPlugin.java (original) +++ felix/trunk/karaf/webconsole/gogo/src/main/java/org/apache/felix/karaf/webconsole/gogo/GogoPlugin.java Fri Sep 18 20:14:54 2009 @@ -40,9 +40,9 @@ import javax.servlet.ServletException; import org.apache.felix.webconsole.AbstractWebConsolePlugin; -import org.apache.felix.karaf.gshell.console.jline.Console; -import org.apache.felix.karaf.gshell.console.Completer; -import org.apache.felix.karaf.gshell.console.completer.AggregateCompleter; +import org.apache.felix.karaf.shell.console.jline.Console; +import org.apache.felix.karaf.shell.console.Completer; +import org.apache.felix.karaf.shell.console.completer.AggregateCompleter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.framework.BundleContext; Modified: felix/trunk/karaf/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml?rev=816769&r1=816768&r2=816769&view=diff ============================================================================== --- felix/trunk/karaf/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml (original) +++ felix/trunk/karaf/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml Fri Sep 18 20:14:54 2009 @@ -38,7 +38,7 @@ unbind-method="unregister"/> </reference-list> - <bean id="commandCompleter" class="org.apache.felix.karaf.gshell.console.completer.CommandsCompleter"> + <bean id="commandCompleter" class="org.apache.felix.karaf.shell.console.completer.CommandsCompleter"> <property name="bundleContext" ref="blueprintBundleContext" /> </bean>
