You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/07/09 10:29:22 UTC
svn commit: r792445 [4/6] - in /felix/trunk/karaf: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/filtered-resources/
assembly/src/main/filtered-resources/etc/ client/
deployer/features/src/main/resources/OSGI-INF/blueprint/ deployer/fil...
Added: felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/TerminalFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/TerminalFactory.java?rev=792445&view=auto
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/TerminalFactory.java (added)
+++ felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/TerminalFactory.java Thu Jul 9 08:29:14 2009
@@ -0,0 +1,61 @@
+package org.apache.felix.karaf.gshell.console.jline;
+
+import java.lang.reflect.Method;
+
+import jline.Terminal;
+import jline.WindowsTerminal;
+import jline.UnixTerminal;
+import jline.UnsupportedTerminal;
+
+public class TerminalFactory {
+
+ private Terminal term;
+ private Thread hook;
+
+ public Terminal getTerminal() throws Exception {
+ init();
+ return term;
+ }
+
+ public synchronized void init() throws Exception {
+ boolean windows = System.getProperty("os.name").toLowerCase().contains("windows");
+ try {
+ if (windows) {
+ WindowsTerminal t = new WindowsTerminal();
+ t.setDirectConsole(true);
+ t.initializeTerminal();
+ term = t;
+ } else {
+ UnixTerminal t = new UnixTerminal();
+ Method mth = UnixTerminal.class.getDeclaredMethod("stty", String.class);
+ mth.setAccessible(true);
+ mth.invoke(null, "intr undef");
+ t.initializeTerminal();
+ hook = new Thread() {
+ public void run() {
+ try {
+ Method mth = UnixTerminal.class.getDeclaredMethod("stty", String.class);
+ mth.setAccessible(true);
+ mth.invoke(null, "intr ^C");
+ } catch (Throwable t) {
+ t.printStackTrace();
+ }
+ }
+ };
+ Runtime.getRuntime().addShutdownHook(hook);
+ term = t;
+ }
+ } catch (Throwable e) {
+ term = new UnsupportedTerminal();
+ }
+ }
+
+ public synchronized void destroy() throws Exception {
+ if (hook != null) {
+ hook.run();
+ Runtime.getRuntime().removeShutdownHook(hook);
+ hook = null;
+ }
+ }
+
+}
Added: felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/keybindings.properties
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/keybindings.properties?rev=792445&view=auto
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/keybindings.properties (added)
+++ felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/keybindings.properties Thu Jul 9 08:29:14 2009
@@ -0,0 +1,62 @@
+# Keybinding mapping for JLine. The format is:
+# [key code]: [logical operation]
+
+# CTRL-B: move to the previous character
+2: PREV_CHAR
+
+# CTRL-G: move to the previous word
+7: PREV_WORD
+
+# CTRL-F: move to the next character
+6: NEXT_CHAR
+
+# CTRL-A: move to the beginning of the line
+1: MOVE_TO_BEG
+
+# CTRL-D: close out the input stream
+4: EXIT
+
+# CTRL-E: move the cursor to the end of the line
+5: MOVE_TO_END
+
+# BACKSPACE, CTRL-H: delete the previous character
+# 8 is the ASCII code for backspace and therefor
+# deleting the previous character
+8: DELETE_PREV_CHAR
+
+# TAB, CTRL-I: signal that console completion should be attempted
+9: COMPLETE
+
+# CTRL-J, CTRL-M: newline
+10: NEWLINE
+
+# CTRL-K: erase the current line
+11: KILL_LINE
+
+# ENTER: newline
+13: NEWLINE
+
+# CTRL-L: clear screen
+12: CLEAR_SCREEN
+
+# CTRL-N: scroll to the next element in the history buffer
+14: NEXT_HISTORY
+
+# CTRL-P: scroll to the previous element in the history buffer
+16: PREV_HISTORY
+
+# CTRL-R: redraw the current line
+18: REDISPLAY
+
+# CTRL-U: delete all the characters before the cursor position
+21: KILL_LINE_PREV
+
+# CTRL-V: paste the contents of the clipboard (useful for Windows terminal)
+22: PASTE
+
+# CTRL-W: delete the word directly before the cursor
+23: DELETE_PREV_WORD
+
+# DELETE, CTRL-?: delete the previous character
+# 127 is the ASCII code for delete
+127: DELETE_PREV_CHAR
Copied: felix/trunk/karaf/gshell/gshell-console/src/main/resources/OSGI-INF/blueprint/gshell-namespacehandler.xml (from r792359, felix/trunk/karaf/gshell/gshell-core/src/main/resources/OSGI-INF/blueprint/gshell-namespacehandler.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-console/src/main/resources/OSGI-INF/blueprint/gshell-namespacehandler.xml?p2=felix/trunk/karaf/gshell/gshell-console/src/main/resources/OSGI-INF/blueprint/gshell-namespacehandler.xml&p1=felix/trunk/karaf/gshell/gshell-core/src/main/resources/OSGI-INF/blueprint/gshell-namespacehandler.xml&r1=792359&r2=792445&rev=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-core/src/main/resources/OSGI-INF/blueprint/gshell-namespacehandler.xml (original)
+++ felix/trunk/karaf/gshell/gshell-console/src/main/resources/OSGI-INF/blueprint/gshell-namespacehandler.xml Thu Jul 9 08:29:14 2009
@@ -23,7 +23,7 @@
<service-properties>
<entry key="osgi.service.blueprint.namespace" value="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0"/>
</service-properties>
- <bean class="org.apache.felix.karaf.gshell.core.config.NamespaceHandler"/>
+ <bean class="org.apache.felix.karaf.gshell.console.commands.NamespaceHandler"/>
</service>
</blueprint>
Added: felix/trunk/karaf/gshell/gshell-console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml?rev=792445&view=auto
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml (added)
+++ felix/trunk/karaf/gshell/gshell-console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml Thu Jul 9 08:29:14 2009
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:ext="http://geronimo.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
+
+ <ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]"/>
+
+ <reference id="commandProcessor" interface="org.osgi.service.command.CommandProcessor">
+ <reference-listener ref="consoleFactory"
+ bind-method="registerCommandProcessor"
+ unbind-method="unregisterCommandProcessor"/>
+ </reference>
+
+ <reference-list id="functions" filter="(&(osgi.command.scope=*)(osgi.command.function=*))"
+ availability="optional">
+ <reference-listener ref="commandCompleter"
+ bind-method="register"
+ unbind-method="unregister"/>
+ </reference-list>
+
+ <bean id="commandCompleter" class="org.apache.felix.karaf.gshell.console.completer.CommandsCompleter">
+ <property name="bundleContext" ref="blueprintBundleContext"/>
+ </bean>
+
+ <bean id="consoleFactory" class="org.apache.felix.karaf.gshell.console.jline.ConsoleFactory">
+ <property name="start" value="$[karaf.startLocalConsole]"/>
+ <property name="bundleContext" ref="blueprintBundleContext"/>
+ <property name="completers">
+ <list>
+ <ref component-id="commandCompleter"/>
+ </list>
+ </property>
+ <property name="terminal" ref="terminal"/>
+ </bean>
+
+ <bean id="terminal"
+ factory-ref="terminalFactory"
+ factory-method="getTerminal"/>
+
+ <bean id="terminalFactory" class="org.apache.felix.karaf.gshell.console.jline.TerminalFactory"
+ init-method="init"
+ destroy-method="destroy"/>
+
+
+</blueprint>
Copied: felix/trunk/karaf/gshell/gshell-console/src/main/resources/org/apache/felix/karaf/gshell/console/commands/karaf-gshell.xsd (from r792359, felix/trunk/karaf/gshell/gshell-core/src/main/resources/org/apache/felix/karaf/gshell/core/karaf-gshell.xsd)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-console/src/main/resources/org/apache/felix/karaf/gshell/console/commands/karaf-gshell.xsd?p2=felix/trunk/karaf/gshell/gshell-console/src/main/resources/org/apache/felix/karaf/gshell/console/commands/karaf-gshell.xsd&p1=felix/trunk/karaf/gshell/gshell-core/src/main/resources/org/apache/felix/karaf/gshell/core/karaf-gshell.xsd&r1=792359&r2=792445&rev=792445&view=diff
==============================================================================
(empty)
Modified: felix/trunk/karaf/gshell/gshell-features/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/pom.xml?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/pom.xml (original)
+++ felix/trunk/karaf/gshell/gshell-features/pom.xml Thu Jul 9 08:29:14 2009
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.core</artifactId>
+ <artifactId>org.apache.felix.karaf.gshell.console</artifactId>
</dependency>
<dependency>
@@ -68,8 +68,8 @@
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
+ <scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
@@ -80,6 +80,11 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -94,10 +99,9 @@
<Import-Package>
javax.management,
javax.management.loading,
- org.apache.geronimo.gshell.command,
- org.apache.geronimo.gshell.wisdom.command,
- org.apache.geronimo.gshell.wisdom.registry,
- org.apache.felix.karaf.gshell.core,
+ org.osgi.service.command,
+ org.apache.felix.gogo.commands,
+ org.apache.felix.karaf.gshell.console,
*
</Import-Package>
<Private-Package>!*</Private-Package>
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.java Thu Jul 9 08:29:14 2009
@@ -19,8 +19,8 @@
import java.net.URI;
import java.util.List;
-import org.apache.geronimo.gshell.clp.Argument;
import org.apache.felix.karaf.gshell.features.FeaturesService;
+import org.apache.felix.gogo.commands.Argument;
public class AddUrlCommand extends FeaturesCommandSupport {
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/FeaturesCommandSupport.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/FeaturesCommandSupport.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/FeaturesCommandSupport.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/FeaturesCommandSupport.java Thu Jul 9 08:29:14 2009
@@ -16,8 +16,8 @@
*/
package org.apache.felix.karaf.gshell.features.commands;
-import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.apache.felix.karaf.gshell.features.FeaturesService;
+import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
import org.osgi.framework.ServiceReference;
public abstract class FeaturesCommandSupport extends OsgiCommandSupport {
@@ -26,13 +26,13 @@
// Get repository admin service.
ServiceReference ref = getBundleContext().getServiceReference(FeaturesService.class.getName());
if (ref == null) {
- io.out.println("FeaturesService service is unavailable.");
+ System.out.println("FeaturesService service is unavailable.");
return null;
}
try {
FeaturesService admin = (FeaturesService) getBundleContext().getService(ref);
if (admin == null) {
- io.out.println("FeaturesService service is unavailable.");
+ System.out.println("FeaturesService service is unavailable.");
return null;
}
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.java Thu Jul 9 08:29:14 2009
@@ -16,8 +16,8 @@
*/
package org.apache.felix.karaf.gshell.features.commands;
-import org.apache.geronimo.gshell.clp.Argument;
import org.apache.felix.karaf.gshell.features.FeaturesService;
+import org.apache.felix.gogo.commands.Argument;
public class InstallFeatureCommand extends FeaturesCommandSupport {
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.java Thu Jul 9 08:29:14 2009
@@ -16,8 +16,8 @@
*/
package org.apache.felix.karaf.gshell.features.commands;
-import org.apache.geronimo.gshell.clp.Option;
import org.apache.felix.karaf.gshell.features.FeaturesService;
+import org.apache.felix.gogo.commands.Option;
public class ListFeaturesCommand extends FeaturesCommandSupport {
@@ -30,18 +30,18 @@
features = admin.listInstalledFeatures();
} else {
// Print column headers.
- io.out.println(" State Version Name");
+ System.out.println(" State Version Name");
features = admin.listFeatures();
}
if ((features != null) && (features.length > 0)) {
for (int i = 0; i < features.length; i++) {
- io.out.println(features[i]);
+ System.out.println(features[i]);
}
} else {
if (installed) {
- io.out.println("No features installed.");
+ System.out.println("No features installed.");
} else {
- io.out.println("No features available.");
+ System.out.println("No features available.");
}
}
}
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListUrlCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListUrlCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListUrlCommand.java Thu Jul 9 08:29:14 2009
@@ -25,10 +25,10 @@
Repository[] repos = admin.listRepositories();
if ((repos != null) && (repos.length > 0)) {
for (int i = 0; i < repos.length; i++) {
- io.out.println(repos[i].getURI());
+ System.out.println(repos[i].getURI());
}
} else {
- io.out.println("No repository URLs are set.");
+ System.out.println("No repository URLs are set.");
}
}
}
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.java Thu Jul 9 08:29:14 2009
@@ -20,9 +20,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.geronimo.gshell.clp.Argument;
import org.apache.felix.karaf.gshell.features.FeaturesService;
import org.apache.felix.karaf.gshell.features.Repository;
+import org.apache.felix.gogo.commands.Argument;
public class RefreshUrlCommand extends FeaturesCommandSupport {
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.java Thu Jul 9 08:29:14 2009
@@ -19,8 +19,8 @@
import java.net.URI;
import java.util.List;
-import org.apache.geronimo.gshell.clp.Argument;
import org.apache.felix.karaf.gshell.features.FeaturesService;
+import org.apache.felix.gogo.commands.Argument;
public class RemoveUrlCommand extends FeaturesCommandSupport {
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.java Thu Jul 9 08:29:14 2009
@@ -16,8 +16,8 @@
*/
package org.apache.felix.karaf.gshell.features.commands;
-import org.apache.geronimo.gshell.clp.Argument;
import org.apache.felix.karaf.gshell.features.FeaturesService;
+import org.apache.felix.gogo.commands.Argument;
public class UninstallFeatureCommand extends FeaturesCommandSupport {
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/AvailableFeatureCompleter.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/AvailableFeatureCompleter.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/AvailableFeatureCompleter.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/AvailableFeatureCompleter.java Thu Jul 9 08:29:14 2009
@@ -19,10 +19,10 @@
import java.util.Collection;
import java.util.List;
-import jline.Completor;
-import org.apache.geronimo.gshell.console.completer.StringsCompleter;
import org.apache.felix.karaf.gshell.features.management.ManagedFeature;
import org.apache.felix.karaf.gshell.features.management.ManagedFeaturesRegistry;
+import org.apache.felix.karaf.gshell.console.completer.StringsCompleter;
+import org.apache.felix.karaf.gshell.console.Completer;
/**
* {@link jline.Completor} for available features.
@@ -30,7 +30,7 @@
* Displays a list of available features from installed repositories.
*
*/
-public class AvailableFeatureCompleter implements Completor {
+public class AvailableFeatureCompleter implements Completer {
private ManagedFeaturesRegistry featuresRegistry;
private StringsCompleter delegate;
@@ -47,7 +47,7 @@
for (ManagedFeature feature : features) {
delegate.getStrings().add(feature.getName());
}
-
+
return delegate.complete(buffer, cursor, candidates);
}
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/FeatureRepositoryCompleter.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/FeatureRepositoryCompleter.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/FeatureRepositoryCompleter.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/FeatureRepositoryCompleter.java Thu Jul 9 08:29:14 2009
@@ -18,9 +18,9 @@
import java.util.List;
-import jline.Completor;
-import org.apache.geronimo.gshell.console.completer.StringsCompleter;
import org.apache.felix.karaf.gshell.features.management.ManagedFeaturesRegistry;
+import org.apache.felix.karaf.gshell.console.completer.StringsCompleter;
+import org.apache.felix.karaf.gshell.console.Completer;
/**
* {@link jline.Completor} for Feature Repository URLs.
@@ -29,7 +29,7 @@
*
*/
-public class FeatureRepositoryCompleter implements Completor {
+public class FeatureRepositoryCompleter implements Completer {
private ManagedFeaturesRegistry featuresRegistry;
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/InstalledFeatureCompleter.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/InstalledFeatureCompleter.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/InstalledFeatureCompleter.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/InstalledFeatureCompleter.java Thu Jul 9 08:29:14 2009
@@ -19,8 +19,8 @@
import java.util.Collection;
import java.util.List;
-import jline.Completor;
-import org.apache.geronimo.gshell.console.completer.StringsCompleter;
+import org.apache.felix.karaf.gshell.console.Completer;
+import org.apache.felix.karaf.gshell.console.completer.StringsCompleter;
import org.apache.felix.karaf.gshell.features.management.ManagedFeature;
import org.apache.felix.karaf.gshell.features.management.ManagedFeaturesRegistry;
@@ -30,7 +30,7 @@
* Displays a list of currently installed features.
*
*/
-public class InstalledFeatureCompleter implements Completor {
+public class InstalledFeatureCompleter implements Completer {
private ManagedFeaturesRegistry featuresRegistry;
private StringsCompleter delegate;
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImpl.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImpl.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImpl.java Thu Jul 9 08:29:14 2009
@@ -36,8 +36,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.felix.karaf.gshell.features.Feature;
import org.apache.felix.karaf.gshell.features.FeaturesRegistry;
import org.apache.felix.karaf.gshell.features.FeaturesService;
@@ -53,6 +51,8 @@
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
import org.osgi.service.prefs.PreferencesService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The Features service implementation.
@@ -65,7 +65,7 @@
private static final String ALIAS_KEY = "_alias_factory_pid";
- private static final Log LOGGER = LogFactory.getLog(FeaturesServiceImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(FeaturesServiceImpl.class);
private BundleContext bundleContext;
private ConfigurationAdmin configAdmin;
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeaturesRegistry.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeaturesRegistry.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeaturesRegistry.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeaturesRegistry.java Thu Jul 9 08:29:14 2009
@@ -22,12 +22,12 @@
import javax.management.MBeanServer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.felix.karaf.gshell.features.Feature;
import org.apache.felix.karaf.gshell.features.FeaturesRegistry;
import org.apache.felix.karaf.gshell.features.FeaturesService;
import org.apache.felix.karaf.gshell.features.Repository;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
/**
* The FeaturesServiceRegistry maintains the managed Features and Repositories
@@ -35,7 +35,7 @@
*/
public class ManagedFeaturesRegistry implements FeaturesRegistry, ManagedFeaturesRegistryMBean {
- private static final transient Log LOG = LogFactory.getLog(ManagedFeaturesRegistry.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ManagedFeaturesRegistry.class);
private NamingStrategy namingStrategy;
private ManagementAgent managementAgent;
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagementAgent.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagementAgent.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagementAgent.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagementAgent.java Thu Jul 9 08:29:14 2009
@@ -26,15 +26,15 @@
import javax.management.ObjectInstance;
import javax.management.ObjectName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
/**
* Management Agent that registers MBeans with JMX MBeanServer.
*/
public class ManagementAgent {
- private static final transient Log LOG = LogFactory.getLog(ManagementAgent.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ManagementAgent.class);
private MBeanServer mbeanServer;
private Set<ObjectName> mbeans = new HashSet<ObjectName>();
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/resources/OSGI-INF/blueprint/gshell-features.xml?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/resources/OSGI-INF/blueprint/gshell-features.xml (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/resources/OSGI-INF/blueprint/gshell-features.xml Thu Jul 9 08:29:14 2009
@@ -32,48 +32,34 @@
<command-bundle xmlns="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0">
<command name="features/addUrl">
- <action class="org.apache.felix.karaf.gshell.features.commands.AddUrlCommand">
- <property name="bundleContext" ref="blueprintBundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.features.commands.AddUrlCommand"/>
</command>
<command name="features/listUrl">
- <action class="org.apache.felix.karaf.gshell.features.commands.ListUrlCommand">
- <property name="bundleContext" ref="blueprintBundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.features.commands.ListUrlCommand"/>
</command>
<command name="features/removeUrl">
- <action class="org.apache.felix.karaf.gshell.features.commands.RemoveUrlCommand">
- <property name="bundleContext" ref="blueprintBundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.features.commands.RemoveUrlCommand"/>
<completers>
<ref component-id="removeUrlCompleter" />
</completers>
</command>
<command name="features/refreshUrl">
- <action class="org.apache.felix.karaf.gshell.features.commands.RefreshUrlCommand">
- <property name="bundleContext" ref="blueprintBundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.features.commands.RefreshUrlCommand"/>
</command>
<command name="features/install">
- <action class="org.apache.felix.karaf.gshell.features.commands.InstallFeatureCommand">
- <property name="bundleContext" ref="blueprintBundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.features.commands.InstallFeatureCommand"/>
<completers>
<ref component-id="installFeatureCompleter" />
</completers>
</command>
<command name="features/uninstall">
- <action class="org.apache.felix.karaf.gshell.features.commands.UninstallFeatureCommand">
- <property name="bundleContext" ref="blueprintBundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.features.commands.UninstallFeatureCommand"/>
<completers>
<ref component-id="uninstallFeatureCompleter" />
</completers>
</command>
<command name="features/list">
- <action class="org.apache.felix.karaf.gshell.features.commands.ListFeaturesCommand">
- <property name="bundleContext" ref="blueprintBundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.features.commands.ListFeaturesCommand"/>
</command>
</command-bundle>
Modified: felix/trunk/karaf/gshell/gshell-log/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-log/pom.xml?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/pom.xml (original)
+++ felix/trunk/karaf/gshell/gshell-log/pom.xml Thu Jul 9 08:29:14 2009
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.core</artifactId>
+ <artifactId>org.apache.felix.karaf.gshell.console</artifactId>
</dependency>
<dependency>
@@ -56,11 +56,6 @@
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-service</artifactId>
</dependency>
@@ -77,11 +72,9 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
- org.apache.geronimo.gshell.command,
- org.apache.geronimo.gshell.wisdom.command,
- org.apache.geronimo.gshell.wisdom.registry,
- org.apache.felix.karaf.gshell.core,
- org.ops4j.pax.logging,
+ org.osgi.service.command,
+ org.apache.felix.gogo.commands,
+ org.apache.felix.karaf.gshell.console,
*
</Import-Package>
<Private-Package>!*</Private-Package>
Modified: felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayException.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayException.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayException.java (original)
+++ felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayException.java Thu Jul 9 08:29:14 2009
@@ -16,18 +16,18 @@
*/
package org.apache.felix.karaf.gshell.log;
-import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
+import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
public class DisplayException extends OsgiCommandSupport {
- protected LruList<PaxLoggingEvent> events;
+ protected LruList events;
- public LruList<PaxLoggingEvent> getEvents() {
+ public LruList getEvents() {
return events;
}
- public void setEvents(LruList<PaxLoggingEvent> events) {
+ public void setEvents(LruList events) {
this.events = events;
}
@@ -42,11 +42,11 @@
}
if (throwableEvent != null) {
for (String r : throwableEvent.getThrowableStrRep()) {
- io.out.println(r);
+ System.out.println(r);
}
- io.out.println();
+ System.out.println();
}
- return Result.SUCCESS;
+ return null;
}
}
Modified: felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayLog.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayLog.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayLog.java (original)
+++ felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayLog.java Thu Jul 9 08:29:14 2009
@@ -16,15 +16,17 @@
*/
package org.apache.felix.karaf.gshell.log;
-import org.apache.geronimo.gshell.clp.Option;
-import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.apache.felix.karaf.gshell.log.layout.PatternConverter;
import org.apache.felix.karaf.gshell.log.layout.PatternParser;
+import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.gogo.commands.Command;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
/**
* Displays the last log entries
*/
+@Command(scope = "log", name = "display", description = "Display log entries.")
public class DisplayLog extends OsgiCommandSupport {
@Option(name = "-n", description="Number of entries to display")
@@ -35,13 +37,13 @@
protected String pattern;
- protected LruList<PaxLoggingEvent> events;
+ protected LruList events;
- public LruList<PaxLoggingEvent> getEvents() {
+ public LruList getEvents() {
return events;
}
- public void setEvents(LruList<PaxLoggingEvent> events) {
+ public void setEvents(LruList events) {
this.events = events;
}
@@ -63,16 +65,16 @@
for (PatternConverter pc = cnv; pc != null; pc = pc.next) {
pc.format(sb, event);
}
- io.out.print(sb.toString());
+ System.out.print(sb.toString());
if (event.getThrowableStrRep() != null) {
for (String r : event.getThrowableStrRep()) {
- io.out.println(r);
+ System.out.println(r);
}
}
}
- io.out.println();
+ System.out.println();
- return Result.SUCCESS;
+ return null;
}
}
Modified: felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/GetLogLevel.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/GetLogLevel.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/GetLogLevel.java (original)
+++ felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/GetLogLevel.java Thu Jul 9 08:29:14 2009
@@ -21,11 +21,11 @@
import java.util.Map;
import java.util.TreeMap;
-import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
+import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.gogo.commands.Argument;
/**
* Get the log level for a given logger
@@ -59,9 +59,9 @@
loggers.put(prop.substring(LOGGER_PREFIX.length()), val);
}
}
- io.out.println("ROOT: " + root);
+ System.out.println("ROOT: " + root);
for (String logger : loggers.keySet()) {
- io.out.println(logger + ": " + loggers.get(logger));
+ System.out.println(logger + ": " + loggers.get(logger));
}
} else {
String logger = this.logger;
@@ -89,9 +89,9 @@
if (logger != this.logger) {
st += " (inherited from " + (logger != null ? logger : "ROOT") + ")";
}
- io.out.println(st);
+ System.out.println(st);
}
- return Result.SUCCESS;
+ return null;
}
protected String getLevel(String prop) {
Modified: felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/LruList.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/LruList.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/LruList.java (original)
+++ felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/LruList.java Thu Jul 9 08:29:14 2009
@@ -20,12 +20,14 @@
import java.util.Arrays;
+import org.ops4j.pax.logging.spi.PaxLoggingEvent;
+
/**
* A list that only keep the last N elements added
*/
-public class LruList<E> {
+public class LruList {
- private E[] elements;
+ private PaxLoggingEvent[] elements;
private transient int start = 0;
private transient int end = 0;
private transient boolean full = false;
@@ -35,7 +37,7 @@
if (size <= 0) {
throw new IllegalArgumentException("The size must be greater than 0");
}
- elements = (E[]) new Object[size];
+ elements = new PaxLoggingEvent[size];
maxElements = elements.length;
}
@@ -53,7 +55,7 @@
}
}
- public void add(E element) {
+ public void add(PaxLoggingEvent element) {
synchronized (elements) {
if (null == element) {
throw new NullPointerException("Attempted to add null object to buffer");
@@ -78,17 +80,17 @@
}
}
- public Iterable<E> getElements() {
+ public Iterable<PaxLoggingEvent> getElements() {
synchronized (elements) {
return getElements(size());
}
}
- public Iterable<E> getElements(int nb) {
+ public Iterable<PaxLoggingEvent> getElements(int nb) {
synchronized (elements) {
int s = size();
nb = Math.min(Math.max(0, nb), s);
- E[] e = (E[]) new Object[nb];
+ PaxLoggingEvent[] e = new PaxLoggingEvent[nb];
for (int i = 0; i < nb; i++) {
e[i] = elements[(i + s - nb + start) % maxElements];
}
Modified: felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/SetLogLevel.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/SetLogLevel.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/SetLogLevel.java (original)
+++ felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/SetLogLevel.java Thu Jul 9 08:29:14 2009
@@ -18,8 +18,8 @@
import java.util.Dictionary;
-import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.gogo.commands.Argument;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
@@ -57,12 +57,12 @@
!WARN.equals(level) &&
!ERROR.equals(level) &&
!INHERITED.equals(level)) {
- io.err.println("level must be set to TRACE, DEBUG, INFO, WARN or ERROR (or - to unset it)");
- return Result.FAILURE;
+ System.err.println("level must be set to TRACE, DEBUG, INFO, WARN or ERROR (or - to unset it)");
+ return null;
}
if (INHERITED.equals(level) && logger == null) {
- io.err.println("Can not unset the ROOT logger");
- return Result.FAILURE;
+ System.err.println("Can not unset the ROOT logger");
+ return null;
}
ConfigurationAdmin cfgAdmin = getConfigAdmin();
@@ -108,7 +108,7 @@
}
cfg.update(props);
- return Result.SUCCESS;
+ return null;
}
protected ConfigurationAdmin getConfigAdmin() {
Modified: felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/VmLogAppender.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/VmLogAppender.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/VmLogAppender.java (original)
+++ felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/VmLogAppender.java Thu Jul 9 08:29:14 2009
@@ -26,13 +26,13 @@
*/
public class VmLogAppender implements PaxAppender {
- protected LruList<PaxLoggingEvent> events;
+ protected LruList events;
- public LruList<PaxLoggingEvent> getEvents() {
+ public LruList getEvents() {
return events;
}
- public void setEvents(LruList<PaxLoggingEvent> events) {
+ public void setEvents(LruList events) {
this.events = events;
}
Modified: felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/blueprint/gshell-log.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/blueprint/gshell-log.xml?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/blueprint/gshell-log.xml (original)
+++ felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/blueprint/gshell-log.xml Thu Jul 9 08:29:14 2009
@@ -32,7 +32,6 @@
<command-bundle xmlns="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0">
<command name="log/display">
<action class="org.apache.felix.karaf.gshell.log.DisplayLog">
- <property name="bundleContext" ref="blueprintBundleContext"/>
<property name="events" ref="events"/>
<property name="pattern" value="${pattern}"/>
</action>
@@ -40,20 +39,15 @@
<link name="log/d" target="log/display"/>
<command name="log/display-exception">
<action class="org.apache.felix.karaf.gshell.log.DisplayException">
- <property name="bundleContext" ref="blueprintBundleContext"/>
<property name="events" ref="events"/>
</action>
</command>
<link name="log/de" target="log/display-exception"/>
<command name="log/get">
- <action class="org.apache.felix.karaf.gshell.log.GetLogLevel">
- <property name="bundleContext" ref="blueprintBundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.log.GetLogLevel" />
</command>
<command name="log/set">
- <action class="org.apache.felix.karaf.gshell.log.SetLogLevel">
- <property name="bundleContext" ref="blueprintBundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.log.SetLogLevel" />
</command>
<alias name="ld" alias="log/d"/>
Modified: felix/trunk/karaf/gshell/gshell-obr/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/pom.xml?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/pom.xml (original)
+++ felix/trunk/karaf/gshell/gshell-obr/pom.xml Thu Jul 9 08:29:14 2009
@@ -51,12 +51,7 @@
<dependency>
<groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
+ <artifactId>org.apache.felix.karaf.gshell.console</artifactId>
</dependency>
</dependencies>
@@ -72,10 +67,9 @@
${pom.artifactId}*;version=${project.version}
</Export-Package>
<Import-Package>
- org.apache.geronimo.gshell.command,
- org.apache.geronimo.gshell.wisdom.command,
- org.apache.geronimo.gshell.wisdom.registry,
- org.apache.felix.karaf.gshell.core,
+ org.osgi.service.command,
+ org.apache.felix.gogo.commands,
+ org.apache.felix.karaf.gshell.console,
*
</Import-Package>
<Private-Package>!*</Private-Package>
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/AddUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/AddUrlCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/AddUrlCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/AddUrlCommand.java Thu Jul 9 08:29:14 2009
@@ -19,8 +19,8 @@
import java.net.URL;
import java.util.List;
-import org.apache.geronimo.gshell.clp.Argument;
import org.osgi.service.obr.RepositoryAdmin;
+import org.apache.felix.gogo.commands.Argument;
public class AddUrlCommand extends ObrCommandSupport {
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/DeployCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/DeployCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/DeployCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/DeployCommand.java Thu Jul 9 08:29:14 2009
@@ -18,8 +18,8 @@
import java.util.List;
-import org.apache.geronimo.gshell.clp.Argument;
import org.osgi.service.obr.RepositoryAdmin;
+import org.apache.felix.gogo.commands.Argument;
public class DeployCommand extends ObrCommandSupport {
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/FileUtil.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/FileUtil.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/FileUtil.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/FileUtil.java Thu Jul 9 08:29:14 2009
@@ -26,6 +26,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
+import java.io.PrintStream;
import java.net.URL;
import java.net.URLConnection;
import java.util.jar.JarEntry;
@@ -34,7 +35,7 @@
public class FileUtil
{
public static void downloadSource(
- PrintWriter out, PrintWriter err,
+ PrintStream out, PrintStream err,
URL srcURL, String dirStr, boolean extract)
{
// Get the file name from the URL.
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/InfoCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/InfoCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/InfoCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/InfoCommand.java Thu Jul 9 08:29:14 2009
@@ -16,13 +16,13 @@
*/
package org.apache.felix.karaf.gshell.obr;
-import java.io.PrintWriter;
+import java.io.PrintStream;
import java.lang.reflect.Array;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.geronimo.gshell.clp.Argument;
+import org.apache.felix.gogo.commands.Argument;
import org.osgi.service.obr.Capability;
import org.osgi.service.obr.RepositoryAdmin;
import org.osgi.service.obr.Requirement;
@@ -39,7 +39,7 @@
Resource[] resources = searchRepository(admin, target[0], target[1]);
if (resources == null)
{
- io.err.println("Unknown bundle and/or version: "
+ System.err.println("Unknown bundle and/or version: "
+ target[0]);
}
else
@@ -48,15 +48,15 @@
{
if (resIdx > 0)
{
- io.out.println("");
+ System.out.println("");
}
- printResource(io.out, resources[resIdx]);
+ printResource(System.out, resources[resIdx]);
}
}
}
}
- private void printResource(PrintWriter out, Resource resource)
+ private void printResource(PrintStream out, Resource resource)
{
printUnderline(out, resource.getPresentationName().length());
out.println(resource.getPresentationName());
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListCommand.java Thu Jul 9 08:29:14 2009
@@ -18,10 +18,10 @@
import java.util.List;
-import org.apache.geronimo.gshell.clp.Argument;
import org.osgi.framework.Version;
import org.osgi.service.obr.RepositoryAdmin;
import org.osgi.service.obr.Resource;
+import org.apache.felix.gogo.commands.Argument;
public class ListCommand extends ObrCommandSupport {
@@ -68,17 +68,17 @@
Version version = resources[resIdx].getVersion();
if (version != null)
{
- io.out.println(name + " (" + version + ")");
+ System.out.println(name + " (" + version + ")");
}
else
{
- io.out.println(name);
+ System.out.println(name);
}
}
if (resources == null)
{
- io.out.println("No matching bundles.");
+ System.out.println("No matching bundles.");
}
}
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListUrlCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListUrlCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListUrlCommand.java Thu Jul 9 08:29:14 2009
@@ -25,10 +25,10 @@
Repository[] repos = admin.listRepositories();
if ((repos != null) && (repos.length > 0)) {
for (int i = 0; i < repos.length; i++) {
- io.out.println(repos[i].getURL());
+ System.out.println(repos[i].getURL());
}
} else {
- io.out.println("No repository URLs are set.");
+ System.out.println("No repository URLs are set.");
}
}
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ObrCommandSupport.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ObrCommandSupport.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ObrCommandSupport.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ObrCommandSupport.java Thu Jul 9 08:29:14 2009
@@ -16,10 +16,10 @@
*/
package org.apache.felix.karaf.gshell.obr;
-import java.io.PrintWriter;
+import java.io.PrintStream;
import java.util.List;
-import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
@@ -36,13 +36,13 @@
// Get repository admin service.
ServiceReference ref = getBundleContext().getServiceReference(RepositoryAdmin.class.getName());
if (ref == null) {
- io.out.println("RepositoryAdmin service is unavailable.");
+ System.out.println("RepositoryAdmin service is unavailable.");
return null;
}
try {
RepositoryAdmin admin = (RepositoryAdmin) getBundleContext().getService(ref);
if (admin == null) {
- io.out.println("RepositoryAdmin service is unavailable.");
+ System.out.println("RepositoryAdmin service is unavailable.");
return null;
}
@@ -123,7 +123,7 @@
return target;
}
- protected void printUnderline(PrintWriter out, int length)
+ protected void printUnderline(PrintStream out, int length)
{
for (int i = 0; i < length; i++)
{
@@ -143,7 +143,7 @@
}
else
{
- io.err.println("Unknown bundle - " + target[0]);
+ System.err.println("Unknown bundle - " + target[0]);
}
}
if ((resolver.getAddedResources() != null) &&
@@ -151,46 +151,46 @@
{
if (resolver.resolve())
{
- io.out.println("Target resource(s):");
- printUnderline(io.out, 19);
+ System.out.println("Target resource(s):");
+ printUnderline(System.out, 19);
Resource[] resources = resolver.getAddedResources();
for (int resIdx = 0; (resources != null) && (resIdx < resources.length); resIdx++)
{
- io.out.println(" " + resources[resIdx].getPresentationName()
+ System.out.println(" " + resources[resIdx].getPresentationName()
+ " (" + resources[resIdx].getVersion() + ")");
}
resources = resolver.getRequiredResources();
if ((resources != null) && (resources.length > 0))
{
- io.out.println("\nRequired resource(s):");
- printUnderline(io.out, 21);
+ System.out.println("\nRequired resource(s):");
+ printUnderline(System.out, 21);
for (int resIdx = 0; resIdx < resources.length; resIdx++)
{
- io.out.println(" " + resources[resIdx].getPresentationName()
+ System.out.println(" " + resources[resIdx].getPresentationName()
+ " (" + resources[resIdx].getVersion() + ")");
}
}
resources = resolver.getOptionalResources();
if ((resources != null) && (resources.length > 0))
{
- io.out.println("\nOptional resource(s):");
- printUnderline(io.out, 21);
+ System.out.println("\nOptional resource(s):");
+ printUnderline(System.out, 21);
for (int resIdx = 0; resIdx < resources.length; resIdx++)
{
- io.out.println(" " + resources[resIdx].getPresentationName()
+ System.out.println(" " + resources[resIdx].getPresentationName()
+ " (" + resources[resIdx].getVersion() + ")");
}
}
try
{
- io.out.print("\nDeploying...");
+ System.out.print("\nDeploying...");
resolver.deploy(start);
- io.out.println("done.");
+ System.out.println("done.");
}
catch (IllegalStateException ex)
{
- io.err.println(ex);
+ System.err.println(ex);
}
}
else
@@ -198,21 +198,21 @@
Requirement[] reqs = resolver.getUnsatisfiedRequirements();
if ((reqs != null) && (reqs.length > 0))
{
- io.out.println("Unsatisfied requirement(s):");
- printUnderline(io.out, 27);
+ System.out.println("Unsatisfied requirement(s):");
+ printUnderline(System.out, 27);
for (int reqIdx = 0; reqIdx < reqs.length; reqIdx++)
{
- io.out.println(" " + reqs[reqIdx].getFilter());
+ System.out.println(" " + reqs[reqIdx].getFilter());
Resource[] resources = resolver.getResources(reqs[reqIdx]);
for (int resIdx = 0; resIdx < resources.length; resIdx++)
{
- io.out.println(" " + resources[resIdx].getPresentationName());
+ System.out.println(" " + resources[resIdx].getPresentationName());
}
}
}
else
{
- io.out.println("Could not resolve targets.");
+ System.out.println("Could not resolve targets.");
}
}
}
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.java Thu Jul 9 08:29:14 2009
@@ -19,9 +19,9 @@
import java.net.URL;
import java.util.List;
-import org.apache.geronimo.gshell.clp.Argument;
import org.osgi.service.obr.Repository;
import org.osgi.service.obr.RepositoryAdmin;
+import org.apache.felix.gogo.commands.Argument;
public class RefreshUrlCommand extends ObrCommandSupport {
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.java Thu Jul 9 08:29:14 2009
@@ -19,7 +19,7 @@
import java.net.URL;
import java.util.List;
-import org.apache.geronimo.gshell.clp.Argument;
+import org.apache.felix.gogo.commands.Argument;
import org.osgi.service.obr.RepositoryAdmin;
public class RemoveUrlCommand extends ObrCommandSupport {
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/SourceCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/SourceCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/SourceCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/SourceCommand.java Thu Jul 9 08:29:14 2009
@@ -19,8 +19,8 @@
import java.net.URL;
import java.util.List;
-import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.clp.Option;
+import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.gogo.commands.Argument;
import org.osgi.service.obr.RepositoryAdmin;
import org.osgi.service.obr.Resource;
@@ -41,18 +41,18 @@
Resource resource = selectNewestVersion(searchRepository(admin, target[0], target[1]));
if (resource == null)
{
- io.err.println("Unknown bundle and/or version: " + target[0]);
+ System.err.println("Unknown bundle and/or version: " + target[0]);
}
else
{
URL srcURL = (URL) resource.getProperties().get(Resource.SOURCE_URL);
if (srcURL != null)
{
- FileUtil.downloadSource(io.out, io.err, srcURL, localDir, extract);
+ FileUtil.downloadSource(System.out, System.err, srcURL, localDir, extract);
}
else
{
- io.err.println("Missing source URL: " + target[0]);
+ System.err.println("Missing source URL: " + target[0]);
}
}
}
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/resources/OSGI-INF/blueprint/gshell-obr.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/resources/OSGI-INF/blueprint/gshell-obr.xml?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/resources/OSGI-INF/blueprint/gshell-obr.xml (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/resources/OSGI-INF/blueprint/gshell-obr.xml Thu Jul 9 08:29:14 2009
@@ -21,49 +21,31 @@
<command-bundle xmlns="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0">
<command name="obr/addUrl">
- <action class="org.apache.felix.karaf.gshell.obr.AddUrlCommand">
- <property name="bundleContext" ref="bundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.obr.AddUrlCommand"/>
</command>
<command name="obr/deploy">
- <action class="org.apache.felix.karaf.gshell.obr.DeployCommand">
- <property name="bundleContext" ref="bundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.obr.DeployCommand"/>
</command>
<command name="obr/info">
- <action class="org.apache.felix.karaf.gshell.obr.InfoCommand">
- <property name="bundleContext" ref="bundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.obr.InfoCommand"/>
</command>
<command name="obr/list">
- <action class="org.apache.felix.karaf.gshell.obr.ListCommand">
- <property name="bundleContext" ref="bundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.obr.ListCommand"/>
</command>
<command name="obr/listUrl">
- <action class="org.apache.felix.karaf.gshell.obr.ListUrlCommand">
- <property name="bundleContext" ref="bundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.obr.ListUrlCommand"/>
</command>
<command name="obr/removeUrl">
- <action class="org.apache.felix.karaf.gshell.obr.RemoveUrlCommand">
- <property name="bundleContext" ref="bundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.obr.RemoveUrlCommand"/>
</command>
<command name="obr/refreshUrl">
- <action class="org.apache.felix.karaf.gshell.obr.RefreshUrlCommand">
- <property name="bundleContext" ref="bundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.obr.RefreshUrlCommand"/>
</command>
<command name="obr/source">
- <action class="org.apache.felix.karaf.gshell.obr.SourceCommand">
- <property name="bundleContext" ref="bundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.obr.SourceCommand"/>
</command>
<command name="obr/start">
- <action class="org.apache.felix.karaf.gshell.obr.StartCommand">
- <property name="bundleContext" ref="bundleContext"/>
- </action>
+ <action class="org.apache.felix.karaf.gshell.obr.StartCommand"/>
</command>
</command-bundle>
Modified: felix/trunk/karaf/gshell/gshell-osgi/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/pom.xml?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/pom.xml (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/pom.xml Thu Jul 9 08:29:14 2009
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.core</artifactId>
+ <artifactId>org.apache.felix.karaf.gshell.console</artifactId>
</dependency>
<dependency>
@@ -48,16 +48,6 @@
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-extender</artifactId>
- </dependency>
</dependencies>
<build>
@@ -70,10 +60,9 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
- org.apache.geronimo.gshell.command,
- org.apache.geronimo.gshell.wisdom.command,
- org.apache.geronimo.gshell.wisdom.registry,
- org.apache.felix.karaf.gshell.core,
+ org.osgi.service.command,
+ org.apache.felix.gogo.commands,
+ org.apache.felix.karaf.gshell.console,
*
</Import-Package>
<Private-Package>!*</Private-Package>
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BlueprintListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BlueprintListener.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BlueprintListener.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BlueprintListener.java Thu Jul 9 08:29:14 2009
@@ -19,13 +19,13 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.BundleListener;
import org.osgi.service.blueprint.container.BlueprintEvent;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
/**
*
@@ -45,7 +45,7 @@
Waiting
}
- private static final Log LOG = LogFactory.getLog(BlueprintListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BlueprintListener.class);
private final Map<Long, BlueprintState> states;
private BundleContext bundleContext;
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleCommand.java Thu Jul 9 08:29:14 2009
@@ -16,9 +16,9 @@
*/
package org.apache.felix.karaf.gshell.osgi;
-import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.clp.Option;
-import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.gogo.commands.Argument;
import org.osgi.framework.Bundle;
public abstract class BundleCommand extends OsgiCommandSupport {
@@ -32,15 +32,15 @@
protected Object doExecute() throws Exception {
Bundle bundle = getBundleContext().getBundle(id);
if (bundle == null) {
- io.out.println("Bundle " + id + " not found");
- return Result.FAILURE;
+ System.out.println("Bundle " + id + " not found");
+ return null;
}
- if (!force && Util.isASystemBundle(getBundleContext(), bundle) && !Util.accessToSystemBundleIsAllowed(bundle.getBundleId(), io)) {
- return Result.FAILURE;
+ if (!force && Util.isASystemBundle(getBundleContext(), bundle) && !Util.accessToSystemBundleIsAllowed(bundle.getBundleId(), session)) {
+ return null;
} else {
doExecute(bundle);
- return Result.SUCCESS;
+ return null;
}
}
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleLevel.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleLevel.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleLevel.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleLevel.java Thu Jul 9 08:29:14 2009
@@ -16,7 +16,7 @@
*/
package org.apache.felix.karaf.gshell.osgi;
-import org.apache.geronimo.gshell.clp.Argument;
+import org.apache.felix.gogo.commands.Argument;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.service.startlevel.StartLevel;
@@ -30,29 +30,29 @@
// Get package admin service.
ServiceReference ref = getBundleContext().getServiceReference(StartLevel.class.getName());
if (ref == null) {
- io.out.println("StartLevel service is unavailable.");
+ System.out.println("StartLevel service is unavailable.");
return;
}
StartLevel sl = getService(StartLevel.class, ref);
if (sl == null) {
- io.out.println("StartLevel service is unavailable.");
+ System.out.println("StartLevel service is unavailable.");
return;
}
if (level == null) {
- io.out.println("Level " + sl.getBundleStartLevel(bundle));
+ System.out.println("Level " + sl.getBundleStartLevel(bundle));
}
else if ((level < 50) && sl.getBundleStartLevel(bundle) > 50){
for (;;) {
StringBuffer sb = new StringBuffer();
- io.err.println("You are about to designate bundle as a system bundle. Do you want to continue (yes/no): ");
- io.err.flush();
+ System.err.println("You are about to designate bundle as a system bundle. Do you want to continue (yes/no): ");
+ System.err.flush();
for (;;) {
- int c = io.in.read();
+ int c = System.in.read();
if (c < 0) {
return;
}
- io.err.println((char) c);
+ System.err.println((char) c);
if (c == '\r' || c == '\n') {
break;
}
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundlesCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundlesCommand.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundlesCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundlesCommand.java Thu Jul 9 08:29:14 2009
@@ -19,9 +19,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.clp.Option;
-import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Option;
import org.osgi.framework.Bundle;
public abstract class BundlesCommand extends OsgiCommandSupport {
@@ -38,16 +38,16 @@
for (long id : ids) {
Bundle bundle = getBundleContext().getBundle(id);
if (bundle == null) {
- io.err.println("Bundle ID" + id + " is invalid");
+ System.err.println("Bundle ID" + id + " is invalid");
} else {
- if (force || !Util.isASystemBundle(getBundleContext(), bundle) || Util.accessToSystemBundleIsAllowed(bundle.getBundleId(), io)) {
+ if (force || !Util.isASystemBundle(getBundleContext(), bundle) || Util.accessToSystemBundleIsAllowed(bundle.getBundleId(), session)) {
bundles.add(bundle);
}
}
}
}
doExecute(bundles);
- return Result.SUCCESS;
+ return null;
}
protected abstract void doExecute(List<Bundle> bundles) throws Exception;
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Headers.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Headers.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Headers.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Headers.java Thu Jul 9 08:29:14 2009
@@ -20,8 +20,8 @@
import java.util.Enumeration;
import java.util.List;
-import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.gogo.commands.Argument;
import org.osgi.framework.Bundle;
public class Headers extends OsgiCommandSupport {
@@ -37,7 +37,7 @@
printHeaders(bundle);
}
else {
- io.err.println("Bundle ID " + id + " is invalid.");
+ System.err.println("Bundle ID " + id + " is invalid.");
}
}
}
@@ -47,20 +47,20 @@
printHeaders(bundles[i]);
}
}
- return Result.SUCCESS;
+ return null;
}
protected void printHeaders(Bundle bundle) throws Exception {
String title = Util.getBundleName(bundle);
- io.out.println("\n" + title);
- io.out.println(Util.getUnderlineString(title));
+ System.out.println("\n" + title);
+ System.out.println(Util.getUnderlineString(title));
Dictionary dict = bundle.getHeaders();
Enumeration keys = dict.keys();
while (keys.hasMoreElements())
{
Object k = (String) keys.nextElement();
Object v = dict.get(k);
- io.out.println(k + " = " + Util.getValueString(v));
+ System.out.println(k + " = " + Util.getValueString(v));
}
}
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/InstallBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/InstallBundle.java?rev=792445&r1=792444&r2=792445&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/InstallBundle.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/InstallBundle.java Thu Jul 9 08:29:14 2009
@@ -16,13 +16,13 @@
*/
package org.apache.felix.karaf.gshell.osgi;
-import java.io.PrintWriter;
+import java.io.PrintStream;
import java.util.ArrayList;
import java.util.List;
-import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.clp.Option;
-import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
+import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.gogo.commands.Option;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
@@ -38,7 +38,7 @@
List<Bundle> bundles = new ArrayList<Bundle>();
StringBuffer sb = new StringBuffer();
for (String url : urls) {
- Bundle bundle = install(url, io.out, io.err);
+ Bundle bundle = install(url, System.out, System.err);
if (bundle != null) {
bundles.add(bundle);
if (sb.length() > 0) {
@@ -53,14 +53,14 @@
}
}
if (sb.toString().indexOf(',') > 0) {
- io.out.println("Bundle IDs: " + sb.toString());
+ System.out.println("Bundle IDs: " + sb.toString());
} else if (sb.length() > 0) {
- io.out.println("Bundle ID: " + sb.toString());
+ System.out.println("Bundle ID: " + sb.toString());
}
- return Result.SUCCESS;
+ return null;
}
- protected Bundle install(String location, PrintWriter out, PrintWriter err) {
+ protected Bundle install(String location, PrintStream out, PrintStream err) {
try {
return getBundleContext().installBundle(location, null);
} catch (IllegalStateException ex) {