Author: cschneider
Date: Wed May 16 08:16:00 2012
New Revision: 1339052
URL: http://svn.apache.org/viewvc?rev=1339052&view=rev
Log:
KARAF-1483 Change back to property based injection
Added:
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/DevCommandSupport.java
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/LogCommandSupport.java
Modified:
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/AbstractBundleCommand.java
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/DynamicImport.java
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/FrameworkOptions.java
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/PrintStackTraces.java
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/ShowBundleTree.java
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/SystemProperty.java
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/Watch.java
karaf/trunk/dev/command/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/ClearLog.java
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/DisplayException.java
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/DisplayLog.java
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/GetLogLevel.java
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/LogTail.java
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/SetLogLevel.java
karaf/trunk/log/command/src/main/resources/OSGI-INF/blueprint/shell-log.xml
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/Action.java
Modified:
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/AbstractBundleCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/AbstractBundleCommand.java?rev=1339052&r1=1339051&r2=1339052&view=diff
==============================================================================
---
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/AbstractBundleCommand.java
(original)
+++
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/AbstractBundleCommand.java
Wed May 16 08:16:00 2012
@@ -17,22 +17,28 @@
package org.apache.karaf.dev.command;
import org.apache.karaf.shell.commands.Argument;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
/**
* Base class for a dev: command that takes a bundle id as an argument
*
* It also provides convient access to the PackageAdmin service
*/
-public abstract class AbstractBundleCommand extends OsgiCommandSupport {
+public abstract class AbstractBundleCommand extends DevCommandSupport {
@Argument(index = 0, name = "id", description = "The bundle ID", required
= true)
Long id;
+
+ protected BundleContext bundleContext;
+
+ public void setBundleContext(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
@Override
protected Object doExecute() throws Exception {
- Bundle bundle = getBundleContext().getBundle(id);
+ Bundle bundle = bundleContext.getBundle(id);
if (bundle == null) {
System.err.println("Bundle ID " + id + " is invalid");
return null;
Added:
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/DevCommandSupport.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/DevCommandSupport.java?rev=1339052&view=auto
==============================================================================
---
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/DevCommandSupport.java
(added)
+++
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/DevCommandSupport.java
Wed May 16 08:16:00 2012
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.dev.command;
+
+import org.apache.karaf.dev.core.DevService;
+import org.apache.karaf.shell.console.AbstractAction;
+
+public abstract class DevCommandSupport extends AbstractAction {
+ protected DevService devService;
+
+ public void setDevService(DevService devService) {
+ this.devService = devService;
+ }
+
+}
Modified:
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/DynamicImport.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/DynamicImport.java?rev=1339052&r1=1339051&r2=1339052&view=diff
==============================================================================
---
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/DynamicImport.java
(original)
+++
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/DynamicImport.java
Wed May 16 08:16:00 2012
@@ -16,7 +16,6 @@
*/
package org.apache.karaf.dev.command;
-import org.apache.karaf.dev.core.DevService;
import org.apache.karaf.shell.commands.Command;
import org.osgi.framework.Bundle;
@@ -26,11 +25,6 @@ import org.osgi.framework.Bundle;
*/
@Command(scope = "dev", name = "dynamic-import", description =
"Enables/disables dynamic-import for a given bundle.")
public class DynamicImport extends AbstractBundleCommand {
- private final DevService devService;
-
- public DynamicImport(DevService devService) {
- this.devService = devService;
- }
@Override
protected void doExecute(Bundle bundle) throws Exception {
Modified:
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/FrameworkOptions.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/FrameworkOptions.java?rev=1339052&r1=1339051&r2=1339052&view=diff
==============================================================================
---
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/FrameworkOptions.java
(original)
+++
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/FrameworkOptions.java
Wed May 16 08:16:00 2012
@@ -16,18 +16,16 @@
*/
package org.apache.karaf.dev.command;
-import org.apache.karaf.dev.core.DevService;
import org.apache.karaf.dev.core.FrameworkType;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
/**
* Command for enabling/disabling debug logging on the OSGi framework
*/
@Command(scope = "dev", name = "framework", description = "OSGi Framework
options.")
-public class FrameworkOptions extends OsgiCommandSupport {
+public class FrameworkOptions extends DevCommandSupport {
@Option(name = "-debug", aliases={"--enable-debug"}, description="Enable
debug for the OSGi framework", required = false, multiValued = false)
boolean debug;
@@ -37,12 +35,6 @@ public class FrameworkOptions extends Os
@Argument(name = "framework", required = false, description = "Name of the
OSGi framework to use")
String framework;
-
- private DevService devService;
-
- public FrameworkOptions(DevService devService) {
- this.devService = devService;
- }
@Override
protected Object doExecute() throws Exception {
Modified:
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/PrintStackTraces.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/PrintStackTraces.java?rev=1339052&r1=1339051&r2=1339052&view=diff
==============================================================================
---
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/PrintStackTraces.java
(original)
+++
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/PrintStackTraces.java
Wed May 16 08:16:00 2012
@@ -18,7 +18,7 @@ package org.apache.karaf.dev.command;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.AbstractAction;
import org.apache.karaf.shell.console.SessionProperties;
/**
@@ -26,7 +26,7 @@ import org.apache.karaf.shell.console.Se
* a given bundle.
*/
@Command(scope = "dev", name = "stack-traces-print", description = "Prints the
full stack trace in the console when the execution of a command throws an
exception.")
-public class PrintStackTraces extends OsgiCommandSupport {
+public class PrintStackTraces extends AbstractAction {
@Argument(name = "print", description="Print stack traces or not",
required = false, multiValued = false)
boolean print = true;
Modified:
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/ShowBundleTree.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/ShowBundleTree.java?rev=1339052&r1=1339051&r2=1339052&view=diff
==============================================================================
---
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/ShowBundleTree.java
(original)
+++
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/ShowBundleTree.java
Wed May 16 08:16:00 2012
@@ -31,7 +31,6 @@ import org.apache.felix.utils.version.Ve
import org.apache.felix.utils.version.VersionTable;
import org.apache.karaf.dev.command.bundletree.Node;
import org.apache.karaf.dev.command.bundletree.Tree;
-import org.apache.karaf.dev.core.DevService;
import org.apache.karaf.shell.commands.Command;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
@@ -54,12 +53,6 @@ public class ShowBundleTree extends Abst
private Tree<Bundle> tree;
- private final DevService devService;
-
- public ShowBundleTree(DevService devService) {
- this.devService = devService;
- }
-
@Override
protected void doExecute(Bundle bundle) throws Exception {
long start = System.currentTimeMillis();
Modified:
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/SystemProperty.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/SystemProperty.java?rev=1339052&r1=1339051&r2=1339052&view=diff
==============================================================================
---
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/SystemProperty.java
(original)
+++
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/SystemProperty.java
Wed May 16 08:16:00 2012
@@ -16,17 +16,15 @@
*/
package org.apache.karaf.dev.command;
-import org.apache.karaf.dev.core.DevService;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
/**
* Command that allow access to system properties easily.
*/
@Command(scope = "dev", name = "system-property", description = "Get or set a
system property.")
-public class SystemProperty extends OsgiCommandSupport {
+public class SystemProperty extends DevCommandSupport {
@Option(name = "-p", aliases = { "--persistent" }, description = "Persist
the new value to the etc/system.properties file")
boolean persistent;
@@ -37,12 +35,6 @@ public class SystemProperty extends Osgi
@Argument(index = 1, name = "value", required = false, description = "New
value for the system property")
String value;
- private DevService devService;
-
- public SystemProperty(DevService devService) {
- this.devService = devService;
- }
-
@Override
protected Object doExecute() throws Exception {
if (value != null) {
Modified:
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/Watch.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/Watch.java?rev=1339052&r1=1339051&r2=1339052&view=diff
==============================================================================
---
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/Watch.java
(original)
+++
karaf/trunk/dev/command/src/main/java/org/apache/karaf/dev/command/Watch.java
Wed May 16 08:16:00 2012
@@ -22,12 +22,12 @@ import org.apache.karaf.dev.core.BundleW
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.AbstractAction;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
@Command(scope = "dev", name = "watch", description = "Watches and updates
bundles", detailedDescription = "Watches the local maven repo for changes in
snapshot jars and redploys changed jars")
-public class Watch extends OsgiCommandSupport {
+public class Watch extends AbstractAction {
@Argument(index = 0, name = "urls", description = "The bundle IDs or
URLs", required = false, multiValued = true)
List<String> urls;
@@ -47,10 +47,10 @@ public class Watch extends OsgiCommandSu
@Option(name = "--list", description = "Displays the watch list", required
= false, multiValued = false)
protected boolean list;
- private BundleWatcher watcher;
-
- public Watch(BundleWatcher watcher) {
- this.watcher = watcher;
+ private BundleWatcher bundleWatcher;
+
+ public void setBundleWatcher(BundleWatcher bundleWatcher) {
+ this.bundleWatcher = bundleWatcher;
}
@Override
@@ -62,34 +62,34 @@ public class Watch extends OsgiCommandSu
if (interval > 0) {
System.out.println("Setting watch interval to " + interval + "
ms");
- watcher.setInterval(interval);
+ bundleWatcher.setInterval(interval);
}
if (stop) {
System.out.println("Stopping watch");
- watcher.stop();
+ bundleWatcher.stop();
}
if (urls != null) {
if (remove) {
for (String url : urls) {
- watcher.remove(url);
+ bundleWatcher.remove(url);
}
} else {
for (String url : urls) {
- watcher.add(url);
+ bundleWatcher.add(url);
}
}
}
if (start) {
System.out.println("Starting watch");
- watcher.start();
+ bundleWatcher.start();
}
if (list) { //List the watched bundles.
String format = "%-40s %6s %-80s";
System.out.println(String.format(format, "URL", "ID", "Bundle
Name"));
- for (String url : watcher.getWatchURLs()) {
+ for (String url : bundleWatcher.getWatchURLs()) {
- List<Bundle> bundleList = watcher.getBundlesByURL(url);
+ List<Bundle> bundleList = bundleWatcher.getBundlesByURL(url);
if (bundleList != null && bundleList.size() > 0) {
for (Bundle bundle : bundleList) {
System.out.println(String.format(format, url,
bundle.getBundleId(), bundle.getHeaders().get(Constants.BUNDLE_NAME)));
@@ -99,10 +99,10 @@ public class Watch extends OsgiCommandSu
}
}
} else {
- List<String> urls = watcher.getWatchURLs();
+ List<String> urls = bundleWatcher.getWatchURLs();
if (urls != null && urls.size()>0) {
System.out.println("Watched URLs/IDs: ");
- for (String url : watcher.getWatchURLs()) {
+ for (String url : bundleWatcher.getWatchURLs()) {
System.out.println(url);
}
} else {
Modified:
karaf/trunk/dev/command/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/dev/command/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1339052&r1=1339051&r2=1339052&view=diff
==============================================================================
--- karaf/trunk/dev/command/src/main/resources/OSGI-INF/blueprint/blueprint.xml
(original)
+++ karaf/trunk/dev/command/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Wed May 16 08:16:00 2012
@@ -22,17 +22,19 @@
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0";>
<command>
<action class="org.apache.karaf.dev.command.ShowBundleTree">
- <argument ref="devService"/>
+ <property name="devService" ref="devService"/>
+ <property name="bundleContext" ref="blueprintBundleContext" />
</action>
</command>
<command>
<action class="org.apache.karaf.dev.command.FrameworkOptions" >
- <argument ref="devService" />
+ <property name="devService" ref="devService"/>
</action>
</command>
<command>
<action class="org.apache.karaf.dev.command.DynamicImport">
- <argument ref="devService" />
+ <property name="devService" ref="devService"/>
+ <property name="bundleContext" ref="blueprintBundleContext" />
</action>
</command>
<command>
@@ -40,17 +42,17 @@
</command>
<command>
<action class="org.apache.karaf.dev.command.SystemProperty" >
- <argument ref="devService" />
+ <property name="devService" ref="devService"/>
</action>
</command>
<command>
<action class="org.apache.karaf.dev.command.Watch" >
- <argument ref="watcher"/>
+ <property name="bundleWatcher" ref="bundleWatcher"/>
</action>
</command>
</command-bundle>
<reference id="devService"
interface="org.apache.karaf.dev.core.DevService"/>
- <reference id="watcher"
interface="org.apache.karaf.dev.core.BundleWatcher"/>
+ <reference id="bundleWatcher"
interface="org.apache.karaf.dev.core.BundleWatcher"/>
</blueprint>
Modified:
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/ClearLog.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/ClearLog.java?rev=1339052&r1=1339051&r2=1339052&view=diff
==============================================================================
---
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/ClearLog.java
(original)
+++
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/ClearLog.java
Wed May 16 08:16:00 2012
@@ -16,21 +16,13 @@
*/
package org.apache.karaf.log.command;
-import org.apache.karaf.log.core.LogService;
import org.apache.karaf.shell.commands.Command;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
/**
* Clear the last log entries.
*/
@Command(scope = "log", name = "clear", description = "Clear log entries.")
-public class ClearLog extends OsgiCommandSupport {
-
- protected LogService logService;
-
- public ClearLog(LogService logService) {
- this.logService = logService;
- }
+public class ClearLog extends LogCommandSupport {
protected Object doExecute() throws Exception {
logService.clearEvents();
Modified:
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/DisplayException.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/DisplayException.java?rev=1339052&r1=1339051&r2=1339052&view=diff
==============================================================================
---
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/DisplayException.java
(original)
+++
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/DisplayException.java
Wed May 16 08:16:00 2012
@@ -16,22 +16,15 @@
*/
package org.apache.karaf.log.command;
-import org.apache.karaf.log.core.LogService;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
@Command(scope = "log", name = "exception-display", description = "Displays
the last occurred exception from the log.")
-public class DisplayException extends OsgiCommandSupport {
+public class DisplayException extends LogCommandSupport {
@Argument(index = 0, name = "logger", description = "The name of the
logger. This can be ROOT, ALL, or the name of a logger specified in the
org.ops4j.pax.logger.cfg file.", required = false, multiValued = false)
String logger;
- private final LogService logService;
-
- public DisplayException(LogService logService) {
- this.logService = logService;
- }
protected Object doExecute() throws Exception {
PaxLoggingEvent throwableEvent = logService.getLastException(logger);
Modified:
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/DisplayLog.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/DisplayLog.java?rev=1339052&r1=1339051&r2=1339052&view=diff
==============================================================================
---
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/DisplayLog.java
(original)
+++
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/DisplayLog.java
Wed May 16 08:16:00 2012
@@ -19,18 +19,16 @@ package org.apache.karaf.log.command;
import java.io.PrintStream;
import org.apache.karaf.log.core.LogEventFormatter;
-import org.apache.karaf.log.core.LogService;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
/**
* Displays the last log entries
*/
@Command(scope = "log", name = "display", description = "Displays log
entries.")
-public class DisplayLog extends OsgiCommandSupport {
+public class DisplayLog extends LogCommandSupport {
@Option(name = "-n", aliases = {}, description="Number of entries to
display", required = false, multiValued = false)
protected int entries;
@@ -44,12 +42,9 @@ public class DisplayLog extends OsgiComm
@Argument(index = 0, name = "logger", description = "The name of the
logger. This can be ROOT, ALL, or the name of a logger specified in the
org.ops4j.pax.logger.cfg file.", required = false, multiValued = false)
String logger;
- protected final LogService logService;
-
- protected final LogEventFormatter formatter;
+ protected LogEventFormatter formatter;
- public DisplayLog(LogService logService, LogEventFormatter formatter) {
- this.logService = logService;
+ public void setFormatter(LogEventFormatter formatter) {
this.formatter = formatter;
}
Modified:
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/GetLogLevel.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/GetLogLevel.java?rev=1339052&r1=1339051&r2=1339052&view=diff
==============================================================================
---
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/GetLogLevel.java
(original)
+++
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/GetLogLevel.java
Wed May 16 08:16:00 2012
@@ -16,26 +16,18 @@
*/
package org.apache.karaf.log.command;
-import org.apache.karaf.log.core.LogService;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
/**
* Get the log level for a given logger
*/
@Command(scope = "log", name = "get", description = "Shows the currently set
log level.")
-public class GetLogLevel extends OsgiCommandSupport {
+public class GetLogLevel extends LogCommandSupport {
@Argument(index = 0, name = "logger", description = "The name of the
logger, ALL or ROOT (default)", required = false, multiValued = false)
String logger;
- private final LogService logService;
-
- public GetLogLevel(LogService logService) {
- this.logService = logService;
- }
-
protected Object doExecute() throws Exception {
System.out.println(logService.getLevelSt(logger));
return null;
Added:
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/LogCommandSupport.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/LogCommandSupport.java?rev=1339052&view=auto
==============================================================================
---
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/LogCommandSupport.java
(added)
+++
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/LogCommandSupport.java
Wed May 16 08:16:00 2012
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.log.command;
+
+import org.apache.karaf.log.core.LogService;
+import org.apache.karaf.shell.console.AbstractAction;
+
+public abstract class LogCommandSupport extends AbstractAction {
+ protected LogService logService;
+
+ public void setLogService(LogService logService) {
+ this.logService = logService;
+ }
+
+}
Modified:
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/LogTail.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/LogTail.java?rev=1339052&r1=1339051&r2=1339052&view=diff
==============================================================================
---
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/LogTail.java
(original)
+++
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/LogTail.java
Wed May 16 08:16:00 2012
@@ -20,8 +20,6 @@ import java.io.PrintStream;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.karaf.log.core.LogEventFormatter;
-import org.apache.karaf.log.core.LogService;
import org.apache.karaf.shell.commands.Command;
import org.ops4j.pax.logging.spi.PaxAppender;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
@@ -29,10 +27,6 @@ import org.ops4j.pax.logging.spi.PaxLogg
@Command(scope = "log", name = "tail", description = "Continuously display log
entries.")
public class LogTail extends DisplayLog {
- public LogTail(LogService logService, LogEventFormatter formatter) {
- super(logService, formatter);
- }
-
protected Object doExecute() throws Exception {
final PrintStream out = System.out;
Modified:
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/SetLogLevel.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/SetLogLevel.java?rev=1339052&r1=1339051&r2=1339052&view=diff
==============================================================================
---
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/SetLogLevel.java
(original)
+++
karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/SetLogLevel.java
Wed May 16 08:16:00 2012
@@ -16,16 +16,14 @@
*/
package org.apache.karaf.log.command;
-import org.apache.karaf.log.core.LogService;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
/**
* Set the log level for a given logger
*/
@Command(scope = "log", name = "set", description = "Sets the log level.")
-public class SetLogLevel extends OsgiCommandSupport {
+public class SetLogLevel extends LogCommandSupport {
@Argument(index = 0, name = "level", description = "The log level to set
(TRACE, DEBUG, INFO, WARN, ERROR) or DEFAULT to unset", required = true,
multiValued = false)
String level;
@@ -33,12 +31,6 @@ public class SetLogLevel extends OsgiCom
@Argument(index = 1, name = "logger", description = "Logger name or ROOT
(default)", required = false, multiValued = false)
String logger;
- private LogService logService;
-
- public SetLogLevel(LogService logService) {
- this.logService = logService;
- }
-
protected Object doExecute() throws Exception {
logService.setLevelSt(logger, level);
return null;
Modified:
karaf/trunk/log/command/src/main/resources/OSGI-INF/blueprint/shell-log.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/log/command/src/main/resources/OSGI-INF/blueprint/shell-log.xml?rev=1339052&r1=1339051&r2=1339052&view=diff
==============================================================================
--- karaf/trunk/log/command/src/main/resources/OSGI-INF/blueprint/shell-log.xml
(original)
+++ karaf/trunk/log/command/src/main/resources/OSGI-INF/blueprint/shell-log.xml
Wed May 16 08:16:00 2012
@@ -24,28 +24,28 @@
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0";>
<command>
<action class="org.apache.karaf.log.command.DisplayLog">
- <argument ref="logService" />
- <argument ref="formatter"/>
+ <property name="logService" ref="logService" />
+ <property name="formatter" ref="formatter"/>
</action>
</command>
<command>
<action class="org.apache.karaf.log.command.DisplayException">
- <argument ref="logService" />
+ <property name="logService" ref="logService" />
</action>
</command>
<command>
<action class="org.apache.karaf.log.command.ClearLog">
- <argument ref="logService" />
+ <property name="logService" ref="logService" />
</action>
</command>
<command>
<action class="org.apache.karaf.log.command.GetLogLevel">
- <argument ref="logService" />
+ <property name="logService" ref="logService" />
</action>
</command>
<command>
<action class="org.apache.karaf.log.command.SetLogLevel" >
- <argument ref="logService" />
+ <property name="logService" ref="logService" />
</action>
<completers>
<ref component-id="logLevelCompleter"/>
@@ -54,8 +54,8 @@
</command>
<command>
<action class="org.apache.karaf.log.command.LogTail">
- <argument ref="logService" />
- <argument ref="formatter"/>
+ <property name="logService" ref="logService" />
+ <property name="formatter" ref="formatter"/>
</action>
</command>
</command-bundle>
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/Action.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/Action.java?rev=1339052&r1=1339051&r2=1339052&view=diff
==============================================================================
---
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/Action.java
(original)
+++
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/Action.java
Wed May 16 08:16:00 2012
@@ -27,7 +27,11 @@ import org.apache.felix.service.command.
* An Action is always part of an AbstractCommand. The AbstractCommand makes
sure
* the single threaded assumption above is true. Before the call to the
execute method
* the action is checked for annotated fields (@Argument, @Option). These
fields
- * are populated from the command arguments before the action is called.
+ * are populated from the command arguments before the action is called.
+ *
+ * Any class implementing Action must have a no argument constructor. This
+ * is necessary so the help generator can instantiate the class and get the
+ * default values.
*/
public interface Action {
