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/20 15:33:55 UTC
[sling-org-apache-sling-feature-inventoryprinter] branch r2f
updated: [r2f] APIs Update
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 1b3c26e [r2f] APIs Update
1b3c26e is described below
commit 1b3c26ef50edb6c91403beb7d65e2e028ec4ddba
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Thu Jun 20 17:33:48 2019 +0200
[r2f] APIs Update
---
.../feature/inventoryservice/impl/FeaturesInventoryPrinter.java | 4 ++--
...eInventoryPrinter.java => Launch2RunningInventoryPrinter.java} | 8 ++++----
...{RuntimeInventoryPrinter.java => RunningInventoryPrinter.java} | 8 ++++----
.../feature/inventoryservice/impl/RuntimeInventoryPrinter.java | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
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 f348b52..c0febd0 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
@@ -31,8 +31,8 @@ import org.osgi.service.component.annotations.Reference;
@Component(
service = InventoryPrinter.class,
property = {
- NAME + "=launch_feature",
- TITLE + "=Sling launch Feature",
+ NAME + "=feature_launch",
+ TITLE + "=Sling Feature - Launch",
FORMAT + "=JSON"
},
reference = {
diff --git a/src/main/java/org/apache/sling/feature/inventoryservice/impl/Launch2RuntimeInventoryPrinter.java b/src/main/java/org/apache/sling/feature/inventoryservice/impl/Launch2RunningInventoryPrinter.java
similarity index 88%
rename from src/main/java/org/apache/sling/feature/inventoryservice/impl/Launch2RuntimeInventoryPrinter.java
rename to src/main/java/org/apache/sling/feature/inventoryservice/impl/Launch2RunningInventoryPrinter.java
index 32a02f0..a596a6a 100644
--- a/src/main/java/org/apache/sling/feature/inventoryservice/impl/Launch2RuntimeInventoryPrinter.java
+++ b/src/main/java/org/apache/sling/feature/inventoryservice/impl/Launch2RunningInventoryPrinter.java
@@ -29,19 +29,19 @@ import org.osgi.service.component.annotations.Reference;
@Component(
service = InventoryPrinter.class,
property = {
- NAME + "=launch2runtime_feature",
- TITLE + "=Sling launch 2 runtime diff",
+ NAME + "=feature_launch2running",
+ TITLE + "=Sling Feature - Launch 2 Runtime",
FORMAT + "=JSON"
},
reference = {
@Reference(field = "generator", name = "generator", service = RuntimeEnvironment2FeatureModel.class)
}
)
-public class Launch2RuntimeInventoryPrinter extends AbstractFeatureInventoryPrinter {
+public class Launch2RunningInventoryPrinter extends AbstractFeatureInventoryPrinter {
@Override
protected Feature getComputedFeature() {
- return generator.getLaunch2RuntimeUpgradingFeature();
+ return generator.getLaunch2RunningUpgradingFeature();
}
}
diff --git a/src/main/java/org/apache/sling/feature/inventoryservice/impl/RuntimeInventoryPrinter.java b/src/main/java/org/apache/sling/feature/inventoryservice/impl/RunningInventoryPrinter.java
similarity index 89%
copy from src/main/java/org/apache/sling/feature/inventoryservice/impl/RuntimeInventoryPrinter.java
copy to src/main/java/org/apache/sling/feature/inventoryservice/impl/RunningInventoryPrinter.java
index 8f7fc1a..9340cd4 100644
--- a/src/main/java/org/apache/sling/feature/inventoryservice/impl/RuntimeInventoryPrinter.java
+++ b/src/main/java/org/apache/sling/feature/inventoryservice/impl/RunningInventoryPrinter.java
@@ -29,19 +29,19 @@ import org.osgi.service.component.annotations.Reference;
@Component(
service = InventoryPrinter.class,
property = {
- NAME + "=runtime_feature",
- TITLE + "=Sling runtime Feature",
+ NAME + "=feature_running",
+ TITLE + "=Sling Feature - Running",
FORMAT + "=JSON"
},
reference = {
@Reference(field = "generator", name = "generator", service = RuntimeEnvironment2FeatureModel.class)
}
)
-public final class RuntimeInventoryPrinter extends AbstractFeatureInventoryPrinter {
+public final class RunningInventoryPrinter extends AbstractFeatureInventoryPrinter {
@Override
protected Feature getComputedFeature() {
- return generator.getRuntimeFeature();
+ return generator.getRunningFeature();
}
}
diff --git a/src/main/java/org/apache/sling/feature/inventoryservice/impl/RuntimeInventoryPrinter.java b/src/main/java/org/apache/sling/feature/inventoryservice/impl/RuntimeInventoryPrinter.java
index 8f7fc1a..585f9a8 100644
--- a/src/main/java/org/apache/sling/feature/inventoryservice/impl/RuntimeInventoryPrinter.java
+++ b/src/main/java/org/apache/sling/feature/inventoryservice/impl/RuntimeInventoryPrinter.java
@@ -29,8 +29,8 @@ import org.osgi.service.component.annotations.Reference;
@Component(
service = InventoryPrinter.class,
property = {
- NAME + "=runtime_feature",
- TITLE + "=Sling runtime Feature",
+ NAME + "=feature_runtime",
+ TITLE + "=Sling Feature - Runtime",
FORMAT + "=JSON"
},
reference = {