Update to latest blueprint api
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@788736 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/NamespaceHandler.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/NamespaceHandler.java
index 6a514bc..6a52865 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/NamespaceHandler.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/NamespaceHandler.java
@@ -189,7 +189,7 @@
private MutableBeanMetadata parseAction(ParserContext context, ComponentMetadata enclosingComponent, Element element) {
MutableBeanMetadata action = context.createMetadata(MutableBeanMetadata.class);
- action.setInitialization(MutableBeanMetadata.INITIALIZATION_LAZY);
+ action.setActivation(MutableBeanMetadata.ACTIVATION_LAZY);
action.setScope(MutableBeanMetadata.SCOPE_PROTOTYPE);
action.setClassName(element.getAttribute("class"));
NodeList children = element.getChildNodes();
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/vfs/config/CacheStrategyConverter.java b/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/vfs/config/CacheStrategyConverter.java
index 02dbba0..7e10ca5 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/vfs/config/CacheStrategyConverter.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/vfs/config/CacheStrategyConverter.java
@@ -19,15 +19,16 @@
package org.apache.geronimo.gshell.vfs.config;
import org.osgi.service.blueprint.container.Converter;
+import org.osgi.service.blueprint.container.ReifiedType;
import org.apache.commons.vfs.CacheStrategy;
public class CacheStrategyConverter implements Converter {
- public boolean canConvert(Object o, Object type) {
- return o instanceof String && type == CacheStrategy.class;
+ public boolean canConvert(Object o, ReifiedType type) {
+ return o instanceof String && type.getRawClass() == CacheStrategy.class;
}
- public Object convert(Object o, Object type) throws Exception {
+ public Object convert(Object o, ReifiedType type) throws Exception {
if (canConvert(o, type)) {
String text = o.toString();
if (text.equalsIgnoreCase("MANUAL")) {
diff --git a/karaf/gshell/gshell-core/src/test/java/org/apache/geronimo/gshell/commands/text/SortTest.java b/karaf/gshell/gshell-core/src/test/java/org/apache/geronimo/gshell/commands/text/SortTest.java
index 90e405e..6bb77a5 100644
--- a/karaf/gshell/gshell-core/src/test/java/org/apache/geronimo/gshell/commands/text/SortTest.java
+++ b/karaf/gshell/gshell-core/src/test/java/org/apache/geronimo/gshell/commands/text/SortTest.java
@@ -23,12 +23,19 @@
import java.util.Collections;
import junit.framework.TestCase;
+import org.apache.geronimo.gshell.ansi.AnsiRenderWriter;
/**
* TODO: remove this file when gshell is upgraded
*/
public class SortTest extends TestCase {
+ public void testAnsi() {
+ AnsiRenderWriter w = new AnsiRenderWriter(System.out);
+ w.println("Hey, @|cyan Hello| world");
+ w.flush();
+ }
+
public void testFieldIndexesDefaultSep() {
SortAction.SortComparator comparator = new SortAction.SortComparator(false, false, false, false, '\0', null);
List<Integer> indexes = comparator.getFieldIndexes(" ad re t ");