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/14 15:29:53 UTC
[sling-whiteboard] branch master updated (a3fe287 -> 6ec82fb)
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git.
from a3fe287 Merge branch 'master' of github.com:apache/sling-whiteboard
new 25bfb6d [feature-diff] diff method args moved to data object in order to simplify readability and backward compatibility as suggested by @bosschaert
new 8333342 [feature-diff] diff method args moved to data object in order to simplify readability and backward compatibility as suggested by @bosschaert
new 6ec82fb [r2f] initial checkin
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../sling/feature/diff/ArtifactsComparator.java | 5 +
.../feature/diff/ConfigurationsComparator.java | 5 +
.../sling/feature/diff/DefaultDiffRequest.java | 94 ++++++++++++++++++
...tureElementComparator.java => DiffRequest.java} | 17 +++-
.../sling/feature/diff/ExtensionsComparator.java | 5 +
.../org/apache/sling/feature/diff/FeatureDiff.java | 23 +++--
.../diff/FrameworkPropertiesComparator.java | 5 +
.../feature/diff/spi/FeatureElementComparator.java | 2 +
.../CODE_OF_CONDUCT.md | 0
{feature-diff => runtime2feature}/CONTRIBUTING.md | 0
{tag-modifier => runtime2feature}/LICENSE | 0
runtime2feature/README.md | 3 +
{feature-diff => runtime2feature}/pom.xml | 30 ++----
.../r2f/AbstractFeatureElementConsumer.java | 16 +++-
.../sling/feature/r2f/Bundle2ArtifactMapper.java | 105 +++++++++++++++++++++
.../sling/feature/r2f/ConversionRequest.java | 12 ++-
.../feature/r2f/DefaultConversionRequest.java | 55 +++++++++++
...GiConfiguration2FeatureConfigurationMapper.java | 55 +++++++++++
.../r2f/RuntimeEnvironment2FeatureModel.java | 76 +++++++++++++++
.../apache/sling/feature/r2f}/package-info.java | 6 +-
20 files changed, 464 insertions(+), 50 deletions(-)
create mode 100644 feature-diff/src/main/java/org/apache/sling/feature/diff/DefaultDiffRequest.java
copy feature-diff/src/main/java/org/apache/sling/feature/diff/{spi/FeatureElementComparator.java => DiffRequest.java} (73%)
copy {feature-diff => runtime2feature}/CODE_OF_CONDUCT.md (100%)
copy {feature-diff => runtime2feature}/CONTRIBUTING.md (100%)
copy {tag-modifier => runtime2feature}/LICENSE (100%)
create mode 100644 runtime2feature/README.md
copy {feature-diff => runtime2feature}/pom.xml (78%)
copy feature-diff/src/main/java/org/apache/sling/feature/diff/spi/FeatureElementComparator.java => runtime2feature/src/main/java/org/apache/sling/feature/r2f/AbstractFeatureElementConsumer.java (68%)
create mode 100644 runtime2feature/src/main/java/org/apache/sling/feature/r2f/Bundle2ArtifactMapper.java
copy content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/spi/ArtifactWriter.java => runtime2feature/src/main/java/org/apache/sling/feature/r2f/ConversionRequest.java (77%)
create mode 100644 runtime2feature/src/main/java/org/apache/sling/feature/r2f/DefaultConversionRequest.java
create mode 100644 runtime2feature/src/main/java/org/apache/sling/feature/r2f/OSGiConfiguration2FeatureConfigurationMapper.java
create mode 100644 runtime2feature/src/main/java/org/apache/sling/feature/r2f/RuntimeEnvironment2FeatureModel.java
copy {feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model => runtime2feature/src/main/java/org/apache/sling/feature/r2f}/package-info.java (88%)
[sling-whiteboard] 01/03: [feature-diff] diff method args moved to
data object in order to simplify readability and backward compatibility as
suggested by @bosschaert
Posted by si...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit 25bfb6d4c597343590dcfa0b304f750d66cf2c3f
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Fri Jun 14 16:40:45 2019 +0200
[feature-diff] diff method args moved to data object in order to
simplify readability and backward compatibility as suggested by
@bosschaert
---
.../sling/feature/diff/DefaultDiffRequest.java | 94 ++++++++++++++++++++++
...tureElementComparator.java => DiffRequest.java} | 17 +++-
.../feature/diff/spi/FeatureElementComparator.java | 2 +
3 files changed, 110 insertions(+), 3 deletions(-)
diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/DefaultDiffRequest.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/DefaultDiffRequest.java
new file mode 100644
index 0000000..d88cbae
--- /dev/null
+++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/DefaultDiffRequest.java
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.sling.feature.diff;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.sling.feature.ArtifactId;
+import org.apache.sling.feature.Feature;
+
+public final class DefaultDiffRequest implements DiffRequest {
+
+ private final Set<String> includeComparators = new HashSet<>();
+
+ private final Set<String> excludeComparators = new HashSet<>();
+
+ private Feature previous;
+
+ private Feature current;
+
+ private ArtifactId resultId;
+
+ @Override
+ public Feature getPrevious() {
+ return previous;
+ }
+
+ public DefaultDiffRequest setPrevious(Feature previous) {
+ this.previous = requireNonNull(previous, "Impossible to compare null previous feature.");
+ return this;
+ }
+
+ @Override
+ public Feature getCurrent() {
+ return current;
+ }
+
+ public DefaultDiffRequest setCurrent(Feature current) {
+ this.current = requireNonNull(current, "Impossible to compare null current feature.");
+ return this;
+ }
+
+ @Override
+ public ArtifactId getResultId() {
+ return resultId;
+ }
+
+ public DefaultDiffRequest setResultId(String resultId) {
+ resultId = requireNonNull(resultId, "Impossible to create the Feature diff with a null id");
+ return setResultId(ArtifactId.parse(resultId));
+ }
+
+ public DefaultDiffRequest setResultId(ArtifactId resultId) {
+ this.resultId = requireNonNull(resultId, "Impossible to create the Feature diff with a null id");
+ return this;
+ }
+
+ public DefaultDiffRequest addIncludeComparator(String includeComparator) {
+ includeComparators.add(requireNonNull(includeComparator, "A null include comparator id is not valid"));
+ return this;
+ }
+
+ @Override
+ public Set<String> getIncludeComparators() {
+ return includeComparators;
+ }
+
+ public DefaultDiffRequest addExcludeComparator(String excludeComparator) {
+ excludeComparators.add(requireNonNull(excludeComparator, "A null exclude comparator id is not valid"));
+ return this;
+ }
+
+ @Override
+ public Set<String> getExcludeComparators() {
+ return excludeComparators;
+ }
+
+}
diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/spi/FeatureElementComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/DiffRequest.java
similarity index 73%
copy from feature-diff/src/main/java/org/apache/sling/feature/diff/spi/FeatureElementComparator.java
copy to feature-diff/src/main/java/org/apache/sling/feature/diff/DiffRequest.java
index 89cbe50..b5f4e39 100644
--- a/feature-diff/src/main/java/org/apache/sling/feature/diff/spi/FeatureElementComparator.java
+++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/DiffRequest.java
@@ -14,12 +14,23 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.diff.spi;
+package org.apache.sling.feature.diff;
+import java.util.Set;
+
+import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
-public interface FeatureElementComparator {
+public interface DiffRequest {
+
+ Feature getPrevious();
+
+ Feature getCurrent();
+
+ ArtifactId getResultId();
+
+ Set<String> getIncludeComparators();
- public void computeDiff(Feature previous, Feature current, Feature target);
+ Set<String> getExcludeComparators();
}
diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/spi/FeatureElementComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/spi/FeatureElementComparator.java
index 89cbe50..7c697f4 100644
--- a/feature-diff/src/main/java/org/apache/sling/feature/diff/spi/FeatureElementComparator.java
+++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/spi/FeatureElementComparator.java
@@ -20,6 +20,8 @@ import org.apache.sling.feature.Feature;
public interface FeatureElementComparator {
+ String getId();
+
public void computeDiff(Feature previous, Feature current, Feature target);
}
[sling-whiteboard] 02/03: [feature-diff] diff method args moved to
data object in order to simplify readability and backward compatibility as
suggested by @bosschaert
Posted by si...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit 8333342021e93b8990520d50b2a02b20a25dd7be
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Fri Jun 14 16:41:46 2019 +0200
[feature-diff] diff method args moved to data object in order to
simplify readability and backward compatibility as suggested by
@bosschaert
---
.../sling/feature/diff/ArtifactsComparator.java | 5 +++++
.../feature/diff/ConfigurationsComparator.java | 5 +++++
.../sling/feature/diff/ExtensionsComparator.java | 5 +++++
.../org/apache/sling/feature/diff/FeatureDiff.java | 23 +++++++++++-----------
.../diff/FrameworkPropertiesComparator.java | 5 +++++
5 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/ArtifactsComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/ArtifactsComparator.java
index a2935db..2a3e521 100644
--- a/feature-diff/src/main/java/org/apache/sling/feature/diff/ArtifactsComparator.java
+++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/ArtifactsComparator.java
@@ -24,6 +24,11 @@ import org.apache.sling.feature.diff.spi.FeatureElementComparator;
final class ArtifactsComparator implements FeatureElementComparator {
@Override
+ public String getId() {
+ return "artifacts";
+ }
+
+ @Override
public void computeDiff(Feature previous, Feature current, Feature target) {
computeDiff(previous.getBundles(), current.getBundles(), target);
}
diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/ConfigurationsComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/ConfigurationsComparator.java
index 718e5d4..6f3e529 100644
--- a/feature-diff/src/main/java/org/apache/sling/feature/diff/ConfigurationsComparator.java
+++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/ConfigurationsComparator.java
@@ -25,6 +25,11 @@ import org.apache.sling.feature.diff.spi.FeatureElementComparator;
final class ConfigurationsComparator implements FeatureElementComparator {
@Override
+ public String getId() {
+ return "configurations";
+ }
+
+ @Override
public void computeDiff(Feature previous, Feature current, Feature target) {
computeDiff(previous.getConfigurations(), current.getConfigurations(), target);
}
diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/ExtensionsComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/ExtensionsComparator.java
index c8a0555..e64a0c9 100644
--- a/feature-diff/src/main/java/org/apache/sling/feature/diff/ExtensionsComparator.java
+++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/ExtensionsComparator.java
@@ -35,6 +35,11 @@ final class ExtensionsComparator implements FeatureElementComparator {
private final ObjectMapper objectMapper = new ObjectMapper();
@Override
+ public String getId() {
+ return "extensions";
+ }
+
+ @Override
public void computeDiff(Feature previous, Feature current, Feature target) {
computeDiff(previous.getExtensions(), current.getExtensions(), target);
}
diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/FeatureDiff.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/FeatureDiff.java
index 8e982d9..19e8c00 100644
--- a/feature-diff/src/main/java/org/apache/sling/feature/diff/FeatureDiff.java
+++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/FeatureDiff.java
@@ -26,22 +26,16 @@ import org.apache.sling.feature.diff.spi.FeatureElementComparator;
public final class FeatureDiff {
- public static Feature compareFeatures(Feature previous, Feature current, String resultId) {
- resultId = requireNonNull(resultId, "Impossible to create the Feature diff with a null id");
-
- ArtifactId id = ArtifactId.parse(resultId);
- return compareFeatures(previous, current, id);
- }
-
- public static Feature compareFeatures(Feature previous, Feature current, ArtifactId resultId) {
- previous = requireNonNull(previous, "Impossible to compare null previous feature.");
- current = requireNonNull(current, "Impossible to compare null current feature.");
+ public static Feature compareFeatures(DiffRequest diffRequest) {
+ requireNonNull(diffRequest, "");
+ Feature previous = requireNonNull(diffRequest.getPrevious(), "Impossible to compare null previous feature.");
+ Feature current = requireNonNull(diffRequest.getCurrent(), "Impossible to compare null current feature.");
if (previous.getId().equals(current.getId())) {
throw new IllegalArgumentException("Input Features refer to the the same Feature version.");
}
- resultId = requireNonNull(resultId, "Impossible to create the Feature diff with a null id");
+ ArtifactId resultId = requireNonNull(diffRequest.getResultId(), "Impossible to create the Feature diff with a null id");
Feature target = new Feature(resultId);
target.setTitle(previous.getId() + " to " + current.getId());
@@ -51,7 +45,12 @@ public final class FeatureDiff {
target.setPrototype(prototype);
for (FeatureElementComparator comparator : load(FeatureElementComparator.class)) {
- comparator.computeDiff(previous, current, target);
+ boolean included = !diffRequest.getIncludeComparators().isEmpty() ? diffRequest.getIncludeComparators().contains(comparator.getId()) : true;
+ boolean excluded = diffRequest.getExcludeComparators().contains(comparator.getId());
+
+ if (included && !excluded) {
+ comparator.computeDiff(previous, current, target);
+ }
}
return target;
diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/FrameworkPropertiesComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/FrameworkPropertiesComparator.java
index 1d4ce1a..7308805 100644
--- a/feature-diff/src/main/java/org/apache/sling/feature/diff/FrameworkPropertiesComparator.java
+++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/FrameworkPropertiesComparator.java
@@ -27,6 +27,11 @@ import org.apache.sling.feature.diff.spi.FeatureElementComparator;
final class FrameworkPropertiesComparator implements FeatureElementComparator {
@Override
+ public String getId() {
+ return "framework-properties";
+ }
+
+ @Override
public void computeDiff(Feature previous, Feature current, Feature target) {
computeDiff(previous.getFrameworkProperties(), current.getFrameworkProperties(), target);
}
[sling-whiteboard] 03/03: [r2f] initial checkin
Posted by si...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit 6ec82fb7fff193bb86522650ca4dd8686049f13c
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Fri Jun 14 17:29:36 2019 +0200
[r2f] initial checkin
---
runtime2feature/CODE_OF_CONDUCT.md | 22 +++
runtime2feature/CONTRIBUTING.md | 24 +++
runtime2feature/LICENSE | 201 +++++++++++++++++++++
runtime2feature/README.md | 3 +
runtime2feature/pom.xml | 73 ++++++++
.../r2f/AbstractFeatureElementConsumer.java | 35 ++++
.../sling/feature/r2f/Bundle2ArtifactMapper.java | 105 +++++++++++
.../sling/feature/r2f/ConversionRequest.java | 28 +++
.../feature/r2f/DefaultConversionRequest.java | 55 ++++++
...GiConfiguration2FeatureConfigurationMapper.java | 55 ++++++
.../r2f/RuntimeEnvironment2FeatureModel.java | 76 ++++++++
.../org/apache/sling/feature/r2f/package-info.java | 17 ++
12 files changed, 694 insertions(+)
diff --git a/runtime2feature/CODE_OF_CONDUCT.md b/runtime2feature/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..0fa18e5
--- /dev/null
+++ b/runtime2feature/CODE_OF_CONDUCT.md
@@ -0,0 +1,22 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+Apache Software Foundation Code of Conduct
+====
+
+Being an Apache project, Apache Sling adheres to the Apache Software Foundation's [Code of Conduct](https://www.apache.org/foundation/policies/conduct.html).
diff --git a/runtime2feature/CONTRIBUTING.md b/runtime2feature/CONTRIBUTING.md
new file mode 100644
index 0000000..ac82a1a
--- /dev/null
+++ b/runtime2feature/CONTRIBUTING.md
@@ -0,0 +1,24 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+Contributing
+====
+
+Thanks for choosing to contribute!
+
+You will find all the necessary details about how you can do this at https://sling.apache.org/contributing.html.
diff --git a/runtime2feature/LICENSE b/runtime2feature/LICENSE
new file mode 100644
index 0000000..261eeb9
--- /dev/null
+++ b/runtime2feature/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/runtime2feature/README.md b/runtime2feature/README.md
new file mode 100644
index 0000000..48b4d0f
--- /dev/null
+++ b/runtime2feature/README.md
@@ -0,0 +1,3 @@
+[<img src="http://sling.apache.org/res/logos/sling.png"/>](http://sling.apache.org)
+
+# Apache Sling runtime to Feature Model generator
diff --git a/runtime2feature/pom.xml b/runtime2feature/pom.xml
new file mode 100644
index 0000000..fac79bc
--- /dev/null
+++ b/runtime2feature/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with this
+ work for additional information regarding copyright ownership. The ASF
+ licenses this file to You under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations under
+ the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>34</version>
+ <relativePath />
+ </parent>
+
+ <artifactId>org.apache.sling.feature.r2f</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <name>Apache Sling Feature Model runtime creator</name>
+ <description>Feature Model runtime creator tool for Apache Sling</description>
+
+ <properties>
+ <sling.java.version>8</sling.java.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <!--
+ | Sling Feature Model libraries
+ -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>5.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.feature</artifactId>
+ <version>1.0.2</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!--
+ | Test only dependencies
+ -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/runtime2feature/src/main/java/org/apache/sling/feature/r2f/AbstractFeatureElementConsumer.java b/runtime2feature/src/main/java/org/apache/sling/feature/r2f/AbstractFeatureElementConsumer.java
new file mode 100644
index 0000000..d93eb84
--- /dev/null
+++ b/runtime2feature/src/main/java/org/apache/sling/feature/r2f/AbstractFeatureElementConsumer.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.sling.feature.r2f;
+
+import java.util.function.Consumer;
+
+import org.apache.sling.feature.Feature;
+
+abstract class AbstractFeatureElementConsumer<T> implements Consumer<T> {
+
+ private final Feature targetFeature;
+
+ public AbstractFeatureElementConsumer(Feature targetFeature) {
+ this.targetFeature = targetFeature;
+ }
+
+ protected final Feature getTargetFeature() {
+ return targetFeature;
+ }
+
+}
diff --git a/runtime2feature/src/main/java/org/apache/sling/feature/r2f/Bundle2ArtifactMapper.java b/runtime2feature/src/main/java/org/apache/sling/feature/r2f/Bundle2ArtifactMapper.java
new file mode 100644
index 0000000..2167bcc
--- /dev/null
+++ b/runtime2feature/src/main/java/org/apache/sling/feature/r2f/Bundle2ArtifactMapper.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.sling.feature.r2f;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Enumeration;
+import java.util.Properties;
+import java.util.function.Function;
+
+import org.apache.sling.feature.Artifact;
+import org.apache.sling.feature.ArtifactId;
+import org.apache.sling.feature.Feature;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.startlevel.BundleStartLevel;
+
+final class Bundle2ArtifactMapper extends AbstractFeatureElementConsumer<Artifact> implements Function<Bundle, Artifact> {
+
+ private static final String POM_PROPERTIES_RESOURCE_NAME = "pom.properties";
+
+ private static final String MAVEN_METADATA_PATH = "META-INF/maven";
+
+ private static final String GROUP_ID = "groupId";
+
+ private static final String ARTIFACT_ID = "artifactId";
+
+ private static final String VERSION = "version";
+
+ private static final String CLASSIFIER = "classifier";
+
+ public Bundle2ArtifactMapper(Feature targetFeature) {
+ super(targetFeature);
+ }
+
+ @Override
+ public Artifact apply(Bundle bundle) {
+ Properties pomProperties = new Properties();
+
+ Enumeration<URL> pomPropertiesURLs = bundle.findEntries(MAVEN_METADATA_PATH, POM_PROPERTIES_RESOURCE_NAME, true);
+ if (pomPropertiesURLs.hasMoreElements()) {
+ URL pomPropertiesURL = pomPropertiesURLs.nextElement();
+
+ try {
+ URLConnection connection = pomPropertiesURL.openConnection();
+ connection.connect();
+
+ try (InputStream inStream = connection.getInputStream()) {
+ pomProperties.load(inStream);
+ }
+
+ if (connection instanceof HttpURLConnection) {
+ ((HttpURLConnection) connection).disconnect();
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("An error occurred while reading "
+ + pomPropertiesURL
+ + " properties file from Bundle "
+ + bundle.getSymbolicName()
+ + " does not export valid Maven metadata", e);
+ }
+ }
+
+ if (pomProperties.isEmpty()) {
+ throw new RuntimeException("Bundle "
+ + bundle.getSymbolicName()
+ + " does not export valid Maven metadata");
+ }
+
+ String groupId = pomProperties.getProperty(GROUP_ID);
+ String artifactId = pomProperties.getProperty(ARTIFACT_ID);
+ String version = pomProperties.getProperty(VERSION);
+ String classifier = pomProperties.getProperty(CLASSIFIER);
+
+ Artifact artifact = new Artifact(new ArtifactId(groupId, artifactId, version, classifier, null));
+
+ BundleStartLevel bundleStartLevel = bundle.adapt(BundleStartLevel.class);
+ int startOrder = bundleStartLevel.getStartLevel();
+ artifact.setStartOrder(startOrder);
+
+ return artifact;
+ }
+
+ @Override
+ public void accept(Artifact artifact) {
+ getTargetFeature().getBundles().add(artifact);
+ }
+
+}
diff --git a/runtime2feature/src/main/java/org/apache/sling/feature/r2f/ConversionRequest.java b/runtime2feature/src/main/java/org/apache/sling/feature/r2f/ConversionRequest.java
new file mode 100644
index 0000000..f0fea30
--- /dev/null
+++ b/runtime2feature/src/main/java/org/apache/sling/feature/r2f/ConversionRequest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.sling.feature.r2f;
+
+import org.apache.sling.feature.ArtifactId;
+import org.osgi.framework.BundleContext;
+
+public interface ConversionRequest {
+
+ ArtifactId getResultId();
+
+ BundleContext getBundleContext();
+
+}
diff --git a/runtime2feature/src/main/java/org/apache/sling/feature/r2f/DefaultConversionRequest.java b/runtime2feature/src/main/java/org/apache/sling/feature/r2f/DefaultConversionRequest.java
new file mode 100644
index 0000000..467aba3
--- /dev/null
+++ b/runtime2feature/src/main/java/org/apache/sling/feature/r2f/DefaultConversionRequest.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.sling.feature.r2f;
+
+import static java.util.Objects.requireNonNull;
+
+import org.apache.sling.feature.ArtifactId;
+import org.osgi.framework.BundleContext;
+
+public class DefaultConversionRequest implements ConversionRequest {
+
+ private ArtifactId resultId;
+
+ private BundleContext bundleContext;
+
+ @Override
+ public ArtifactId getResultId() {
+ return resultId;
+ }
+
+ public DefaultConversionRequest setResultId(String resultId) {
+ resultId = requireNonNull(resultId, "Impossible to create the Feature diff with a null id");
+ return setResultId(ArtifactId.parse(resultId));
+ }
+
+ public DefaultConversionRequest setResultId(ArtifactId resultId) {
+ this.resultId = requireNonNull(resultId, "Impossible to create the Feature diff with a null id");
+ return this;
+ }
+
+ @Override
+ public BundleContext getBundleContext() {
+ return bundleContext;
+ }
+
+ public DefaultConversionRequest setBundleContext(BundleContext bundleContext) {
+ this.bundleContext = requireNonNull(bundleContext, "Impossible to create the Feature from a null BundleContext");
+ return this;
+ }
+
+}
diff --git a/runtime2feature/src/main/java/org/apache/sling/feature/r2f/OSGiConfiguration2FeatureConfigurationMapper.java b/runtime2feature/src/main/java/org/apache/sling/feature/r2f/OSGiConfiguration2FeatureConfigurationMapper.java
new file mode 100644
index 0000000..19dadf9
--- /dev/null
+++ b/runtime2feature/src/main/java/org/apache/sling/feature/r2f/OSGiConfiguration2FeatureConfigurationMapper.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.sling.feature.r2f;
+
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.function.Function;
+
+import org.apache.sling.feature.Configuration;
+import org.apache.sling.feature.Feature;
+
+final class OSGiConfiguration2FeatureConfigurationMapper
+ extends AbstractFeatureElementConsumer<Configuration>
+ implements Function<org.osgi.service.cm.Configuration, Configuration> {
+
+ public OSGiConfiguration2FeatureConfigurationMapper(Feature targetFeature) {
+ super(targetFeature);
+ }
+
+ @Override
+ public Configuration apply(org.osgi.service.cm.Configuration sourceConfiguration) {
+ Configuration targetConfiguration = new Configuration(sourceConfiguration.getPid());
+
+ Dictionary<String, Object> configurationProperties = sourceConfiguration.getProperties();
+ Enumeration<String> keys = configurationProperties.keys();
+ while (keys.hasMoreElements()) {
+ String key = keys.nextElement();
+ Object value = configurationProperties.get(key);
+
+ targetConfiguration.getProperties().put(key, value);
+ }
+
+ return targetConfiguration;
+ }
+
+ @Override
+ public void accept(Configuration configuration) {
+ getTargetFeature().getConfigurations().add(configuration);
+ }
+
+}
diff --git a/runtime2feature/src/main/java/org/apache/sling/feature/r2f/RuntimeEnvironment2FeatureModel.java b/runtime2feature/src/main/java/org/apache/sling/feature/r2f/RuntimeEnvironment2FeatureModel.java
new file mode 100644
index 0000000..5f024e5
--- /dev/null
+++ b/runtime2feature/src/main/java/org/apache/sling/feature/r2f/RuntimeEnvironment2FeatureModel.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.sling.feature.r2f;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.stream.Stream;
+
+import org.apache.sling.feature.ArtifactId;
+import org.apache.sling.feature.Feature;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
+
+public final class RuntimeEnvironment2FeatureModel {
+
+ public static Feature scanAndAssemble(ConversionRequest conversionRequest) {
+ ArtifactId resultId = requireNonNull(conversionRequest.getResultId(), "Impossible to create the Feature with a null id");
+ BundleContext bundleContext = requireNonNull(conversionRequest.getBundleContext(), "Impossible to create the Feature from a null BundleContext");
+
+ Feature targetFeature = new Feature(resultId);
+
+ // collect all bundles
+
+ Bundle[] bundles = bundleContext.getBundles();
+ if (bundles != null) {
+ Bundle2ArtifactMapper mapper = new Bundle2ArtifactMapper(targetFeature);
+
+ Stream.of(bundles).map(mapper).forEach(mapper);
+ }
+
+ // collect all configurations
+
+ ServiceReference<ConfigurationAdmin> configurationAdminReference = bundleContext.getServiceReference(ConfigurationAdmin.class);
+ if (configurationAdminReference != null) {
+ ConfigurationAdmin configurationAdmin = bundleContext.getService(configurationAdminReference);
+ try {
+ Configuration[] configurations = configurationAdmin.listConfigurations(null);
+ if (configurations != null) {
+ OSGiConfiguration2FeatureConfigurationMapper mapper = new OSGiConfiguration2FeatureConfigurationMapper(targetFeature);
+
+ Stream.of(configurations).map(mapper).forEach(mapper);
+ }
+ } catch (Exception e) {
+ // that should not happen
+ throw new RuntimeException("Something went wrong while iterating over all available Configurations", e);
+ }
+ }
+
+ return targetFeature;
+ }
+
+ /**
+ * This class must not be instantiated from outside.
+ */
+ private RuntimeEnvironment2FeatureModel() {
+ // do nothing
+ }
+
+}
diff --git a/runtime2feature/src/main/java/org/apache/sling/feature/r2f/package-info.java b/runtime2feature/src/main/java/org/apache/sling/feature/r2f/package-info.java
new file mode 100644
index 0000000..15549c4
--- /dev/null
+++ b/runtime2feature/src/main/java/org/apache/sling/feature/r2f/package-info.java
@@ -0,0 +1,17 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.sling.feature.r2f;