svn commit: r1771154 - in /sling/trunk/contrib/extensions/contextaware-config/impl: ./ src/main/java/org/apache/sling/caconfig/management/impl/console/ src/test/java/org/apache/sling/caconfig/management/impl/console/

[ss...@apache.org]

Author: sseifert
Date: Thu Nov 24 14:31:58 2016
New Revision: 1771154

URL: http://svn.apache.org/viewvc?rev=1771154&view=rev
Log:
SLING-6307 switch to felix inventory API

Added:
    sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/console/CAConfigInventoryPrinter.java
      - copied, changed from r1771149, sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/console/CAConfigConfigurationPrinter.java
    sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/console/CAConfigInventoryPrinterTest.java
      - copied, changed from r1771149, sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/console/CAConfigConfigurationPrinterTest.java
Removed:
    sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/console/CAConfigConfigurationPrinter.java
    sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/console/CAConfigConfigurationPrinterTest.java
Modified:
    sling/trunk/contrib/extensions/contextaware-config/impl/pom.xml

Modified: sling/trunk/contrib/extensions/contextaware-config/impl/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/pom.xml?rev=1771154&r1=1771153&r2=1771154&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/impl/pom.xml (original)
+++ sling/trunk/contrib/extensions/contextaware-config/impl/pom.xml Thu Nov 24 14:31:58 2016
@@ -134,6 +134,12 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.inventory</artifactId>
+            <version>1.0.4</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.xss</artifactId>
             <version>1.0.0</version>

Copied: sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/console/CAConfigInventoryPrinter.java (from r1771149, sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/console/CAConfigConfigurationPrinter.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/console/CAConfigInventoryPrinter.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/console/CAConfigInventoryPrinter.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/console/CAConfigConfigurationPrinter.java&r1=1771149&r2=1771154&rev=1771154&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/console/CAConfigConfigurationPrinter.java (original)
+++ sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/console/CAConfigInventoryPrinter.java Thu Nov 24 14:31:58 2016
@@ -27,8 +27,8 @@ import java.util.TreeMap;
 
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.felix.webconsole.ConfigurationPrinter;
-import org.apache.felix.webconsole.WebConsoleConstants;
+import org.apache.felix.inventory.Format;
+import org.apache.felix.inventory.InventoryPrinter;
 import org.apache.sling.caconfig.resource.spi.CollectionInheritanceDecider;
 import org.apache.sling.caconfig.resource.spi.ConfigurationResourceResolvingStrategy;
 import org.apache.sling.caconfig.resource.spi.ContextPathStrategy;
@@ -48,15 +48,14 @@ import org.osgi.service.component.annota
 /**
  * Web console configuration printer.
  */
-@Component(service=ConfigurationPrinter.class,
-property={Constants.SERVICE_DESCRIPTION + "=Apache Sling Context-Aware Configuration Resolver Console Configuration Printer",
-        WebConsoleConstants.PLUGIN_LABEL + "=" + CAConfigConfigurationPrinter.LABEL,
-        WebConsoleConstants.PLUGIN_TITLE + "=" + CAConfigConfigurationPrinter.TITLE,
-        WebConsoleConstants.CONFIG_PRINTER_MODES + "=" + ConfigurationPrinter.MODE_ALWAYS})
-@SuppressWarnings("deprecation")
-public class CAConfigConfigurationPrinter implements ConfigurationPrinter {
+@Component(service=InventoryPrinter.class,
+property={Constants.SERVICE_DESCRIPTION + "=Apache Sling Context-Aware Configuration Resolver Console Inventory Printer",
+        InventoryPrinter.NAME + "=" + CAConfigInventoryPrinter.NAME,
+        InventoryPrinter.TITLE + "=" + CAConfigInventoryPrinter.TITLE,
+        InventoryPrinter.FORMAT + "=TEXT"})
+public class CAConfigInventoryPrinter implements InventoryPrinter {
 
-    public static final String LABEL = "slingcaconfig";
+    public static final String NAME = "slingcaconfig";
     public static final String TITLE = "Sling Context-Aware Configuration";
     
     private BundleContext bundleContext;
@@ -67,12 +66,11 @@ public class CAConfigConfigurationPrinte
     }
     
     @Override
-    public String getTitle() {
-        return TITLE;
-    }
+    public void print(PrintWriter pw, Format format, boolean isZip) {
+        if (format != Format.TEXT) {
+            return;
+        }
 
-    @Override
-    public void printConfiguration(PrintWriter pw) {
         printSPISection(pw, ContextPathStrategy.class, "Context Path Strategies");
         printSPISection(pw, ConfigurationResourceResolvingStrategy.class, "Configuration Resource Resolving Strategies");
         printSPISection(pw, CollectionInheritanceDecider.class, "Collection Inheritance Deciders");

Copied: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/console/CAConfigInventoryPrinterTest.java (from r1771149, sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/console/CAConfigConfigurationPrinterTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/console/CAConfigInventoryPrinterTest.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/console/CAConfigInventoryPrinterTest.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/console/CAConfigConfigurationPrinterTest.java&r1=1771149&r2=1771154&rev=1771154&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/console/CAConfigConfigurationPrinterTest.java (original)
+++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/console/CAConfigInventoryPrinterTest.java Thu Nov 24 14:31:58 2016
@@ -25,6 +25,7 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.felix.inventory.Format;
 import org.apache.sling.caconfig.impl.ConfigurationTestUtils;
 import org.apache.sling.caconfig.impl.def.DefaultConfigurationInheritanceStrategy;
 import org.apache.sling.caconfig.impl.def.DefaultConfigurationPersistenceStrategy;
@@ -46,7 +47,7 @@ import com.google.common.collect.Immutab
 import com.google.common.collect.ImmutableSortedSet;
 
 @RunWith(MockitoJUnitRunner.class)
-public class CAConfigConfigurationPrinterTest {
+public class CAConfigInventoryPrinterTest {
     
     private static final String SAMPLE_CONFIG_NAME = "sample.config.Name";
     private static final String SAMPLE_OVERRIDE_STRING = "[/sample]override/string='abc'";
@@ -59,7 +60,7 @@ public class CAConfigConfigurationPrinte
     @Mock
     private ConfigurationOverrideProvider configurationOverrideProvider;
     
-    private CAConfigConfigurationPrinter underTest;
+    private CAConfigInventoryPrinter underTest;
     
     @Before
     public void setUp() {
@@ -67,7 +68,7 @@ public class CAConfigConfigurationPrinte
         context.registerInjectActivateService(new ConfigurationMetadataProviderMultiplexer());
         context.registerService(ConfigurationOverrideProvider.class, configurationOverrideProvider);
         ConfigurationTestUtils.registerConfigurationResolver(context);
-        underTest = context.registerInjectActivateService(new CAConfigConfigurationPrinter());
+        underTest = context.registerInjectActivateService(new CAConfigInventoryPrinter());
     
         ConfigurationMetadata configMetadata = new ConfigurationMetadata(SAMPLE_CONFIG_NAME);
         configMetadata.setPropertyMetadata(ImmutableMap.<String,PropertyMetadata<?>>of(
@@ -83,7 +84,7 @@ public class CAConfigConfigurationPrinte
     @Test
     public void testPrintConfiguration() {
         StringWriter sw = new StringWriter();
-        underTest.printConfiguration(new PrintWriter(sw));
+        underTest.print(new PrintWriter(sw), Format.TEXT, false);
         String result = sw.toString();
         
         // test existance of some strategy names