Clean up usage of SCR annotations
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1614325 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/jcr/webconsole/internal/DescriptorsConfigurationPrinter.java b/src/main/java/org/apache/sling/jcr/webconsole/internal/DescriptorsConfigurationPrinter.java
index aca9344..cbc2695 100644
--- a/src/main/java/org/apache/sling/jcr/webconsole/internal/DescriptorsConfigurationPrinter.java
+++ b/src/main/java/org/apache/sling/jcr/webconsole/internal/DescriptorsConfigurationPrinter.java
@@ -33,7 +33,7 @@
* A Felix WebConsole ConfigurationPrinter which outputs the current JCR
* repository descriptors.
*/
-@Component(label = "%descriptors.printer.name", description = "%descriptors.printer.description", metatype = false)
+@Component
@Service(ConfigurationPrinter.class)
@Properties({
@Property(name = "service.description", value = "JCR Descriptors Configuration Printer"),
diff --git a/src/main/java/org/apache/sling/jcr/webconsole/internal/NamespaceConfigurationPrinter.java b/src/main/java/org/apache/sling/jcr/webconsole/internal/NamespaceConfigurationPrinter.java
index e91e4b4..30a1302 100644
--- a/src/main/java/org/apache/sling/jcr/webconsole/internal/NamespaceConfigurationPrinter.java
+++ b/src/main/java/org/apache/sling/jcr/webconsole/internal/NamespaceConfigurationPrinter.java
@@ -39,7 +39,7 @@
* A Felix WebConsole ConfigurationPrinter which outputs the current JCR
* namespace mappings.
*/
-@Component(label = "%namespace.printer.name", description = "%namespace.printer.description", metatype = false)
+@Component
@Service(ConfigurationPrinter.class)
@Properties({
@Property(name = "service.description", value = "JCR Namespace Configuration Printer"),
diff --git a/src/main/java/org/apache/sling/jcr/webconsole/internal/NodeTypeConfigurationPrinter.java b/src/main/java/org/apache/sling/jcr/webconsole/internal/NodeTypeConfigurationPrinter.java
index 7d40db7..d31f4c0 100644
--- a/src/main/java/org/apache/sling/jcr/webconsole/internal/NodeTypeConfigurationPrinter.java
+++ b/src/main/java/org/apache/sling/jcr/webconsole/internal/NodeTypeConfigurationPrinter.java
@@ -46,7 +46,7 @@
* A Felix WebConsole ConfigurationPrinter which outputs the current JCR
* nodetypes.
*/
-@Component(label = "%nodetype.printer.name", description = "%nodetype.printer.description", metatype = false)
+@Component
@Service(ConfigurationPrinter.class)
@Properties({
@Property(name = "service.description", value = "JCR Nodetype Configuration Printer"),
