You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by si...@apache.org on 2019/06/18 17:16:33 UTC
[sling-org-apache-sling-feature-inventoryprinter] branch r2f
updated: Declaring the Service via SCR annotation
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch r2f
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-inventoryprinter.git
The following commit(s) were added to refs/heads/r2f by this push:
new 8540691 Declaring the Service via SCR annotation
8540691 is described below
commit 8540691eb75e3ac3a41ba26c00df3108ed7eaca1
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Tue Jun 18 19:16:26 2019 +0200
Declaring the Service via SCR annotation
---
.../inventoryservice/impl/BaseFeature2CurrentRuntimePrinter.java | 2 ++
.../sling/feature/inventoryservice/impl/FeaturesInventoryPrinter.java | 2 ++
.../inventoryservice/impl/RuntimeEnvironment2FeatureModelPrinter.java | 2 ++
3 files changed, 6 insertions(+)
diff --git a/src/main/java/org/apache/sling/feature/inventoryservice/impl/BaseFeature2CurrentRuntimePrinter.java b/src/main/java/org/apache/sling/feature/inventoryservice/impl/BaseFeature2CurrentRuntimePrinter.java
index 90a40f4..9730e8a 100644
--- a/src/main/java/org/apache/sling/feature/inventoryservice/impl/BaseFeature2CurrentRuntimePrinter.java
+++ b/src/main/java/org/apache/sling/feature/inventoryservice/impl/BaseFeature2CurrentRuntimePrinter.java
@@ -21,12 +21,14 @@ import static org.apache.felix.inventory.InventoryPrinter.NAME;
import static org.apache.felix.inventory.InventoryPrinter.TITLE;
import static org.apache.sling.feature.diff.FeatureDiff.compareFeatures;
+import org.apache.felix.inventory.InventoryPrinter;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.diff.DefaultDiffRequest;
import org.osgi.service.component.annotations.Component;
@Component(
+ service = InventoryPrinter.class,
property = {
NAME + "=r2f_base2runtime",
TITLE + "=Apache Sling Runtime Environment to Feature Model converter - Base 2 Runtime diff Generator",
diff --git a/src/main/java/org/apache/sling/feature/inventoryservice/impl/FeaturesInventoryPrinter.java b/src/main/java/org/apache/sling/feature/inventoryservice/impl/FeaturesInventoryPrinter.java
index 76bff52..a706046 100644
--- a/src/main/java/org/apache/sling/feature/inventoryservice/impl/FeaturesInventoryPrinter.java
+++ b/src/main/java/org/apache/sling/feature/inventoryservice/impl/FeaturesInventoryPrinter.java
@@ -25,9 +25,11 @@ import static org.apache.felix.inventory.InventoryPrinter.TITLE;
import java.io.BufferedReader;
import java.io.PrintWriter;
+import org.apache.felix.inventory.InventoryPrinter;
import org.osgi.service.component.annotations.Component;
@Component(
+ service = InventoryPrinter.class,
property = {
NAME + "=launch_feature",
TITLE + "=Launch Feature",
diff --git a/src/main/java/org/apache/sling/feature/inventoryservice/impl/RuntimeEnvironment2FeatureModelPrinter.java b/src/main/java/org/apache/sling/feature/inventoryservice/impl/RuntimeEnvironment2FeatureModelPrinter.java
index b86134b..ca6147b 100644
--- a/src/main/java/org/apache/sling/feature/inventoryservice/impl/RuntimeEnvironment2FeatureModelPrinter.java
+++ b/src/main/java/org/apache/sling/feature/inventoryservice/impl/RuntimeEnvironment2FeatureModelPrinter.java
@@ -20,10 +20,12 @@ import static org.apache.felix.inventory.InventoryPrinter.FORMAT;
import static org.apache.felix.inventory.InventoryPrinter.NAME;
import static org.apache.felix.inventory.InventoryPrinter.TITLE;
+import org.apache.felix.inventory.InventoryPrinter;
import org.apache.sling.feature.Feature;
import org.osgi.service.component.annotations.Component;
@Component(
+ service = InventoryPrinter.class,
property = {
NAME + "=r2f_runtime",
TITLE + "=Apache Sling Runtime Environment to Feature Model converter - Runtime Generator",