You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@sling.apache.org by GitBox <gi...@apache.org> on 2018/04/17 06:22:47 UTC
[GitHub] bosschaert closed pull request #11: Move the process package from
the feature api module to the support one.
bosschaert closed pull request #11: Move the process package from the feature api module to the support one.
URL: https://github.com/apache/sling-whiteboard/pull/11
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java b/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
index 8fd9bd5..e8b27fa 100644
--- a/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
+++ b/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
@@ -23,12 +23,12 @@
import org.apache.sling.feature.analyser.impl.BundleDescriptorImpl;
import org.apache.sling.feature.analyser.service.Analyser;
import org.apache.sling.feature.analyser.service.Scanner;
-import org.apache.sling.feature.process.FeatureResolver;
import org.apache.sling.feature.support.ArtifactManager;
import org.apache.sling.feature.support.ArtifactManagerConfig;
import org.apache.sling.feature.support.FeatureUtil;
import org.apache.sling.feature.support.json.FeatureJSONReader;
import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
+import org.apache.sling.feature.support.process.FeatureResolver;
import org.junit.Test;
import java.io.File;
diff --git a/featuremodel/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java b/featuremodel/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
index 3235e81..57c08b2 100644
--- a/featuremodel/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
+++ b/featuremodel/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
@@ -24,12 +24,12 @@
import org.apache.commons.cli.ParseException;
import org.apache.sling.feature.Application;
import org.apache.sling.feature.ArtifactId;
-import org.apache.sling.feature.process.FeatureResolver;
import org.apache.sling.feature.resolver.FrameworkResolver;
import org.apache.sling.feature.support.ArtifactManager;
import org.apache.sling.feature.support.ArtifactManagerConfig;
import org.apache.sling.feature.support.FeatureUtil;
import org.apache.sling.feature.support.json.ApplicationJSONWriter;
+import org.apache.sling.feature.support.process.FeatureResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/featuremodel/feature-applicationbuilder/src/test/java/org/apache/sling/feature/applicationbuilder/impl/ApplicationBuilderTest.java b/featuremodel/feature-applicationbuilder/src/test/java/org/apache/sling/feature/applicationbuilder/impl/ApplicationBuilderTest.java
index 6efa834..4887eb7 100644
--- a/featuremodel/feature-applicationbuilder/src/test/java/org/apache/sling/feature/applicationbuilder/impl/ApplicationBuilderTest.java
+++ b/featuremodel/feature-applicationbuilder/src/test/java/org/apache/sling/feature/applicationbuilder/impl/ApplicationBuilderTest.java
@@ -19,10 +19,6 @@
import org.apache.sling.feature.Application;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.process.ApplicationBuilder;
-import org.apache.sling.feature.process.BuilderContext;
-import org.apache.sling.feature.process.FeatureProvider;
-import org.apache.sling.feature.process.FeatureResolver;
import org.apache.sling.feature.resolver.FrameworkResolver;
import org.apache.sling.feature.support.ArtifactHandler;
import org.apache.sling.feature.support.ArtifactManager;
@@ -30,6 +26,10 @@
import org.apache.sling.feature.support.json.ApplicationJSONWriter;
import org.apache.sling.feature.support.json.FeatureJSONReader;
import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
+import org.apache.sling.feature.support.process.ApplicationBuilder;
+import org.apache.sling.feature.support.process.BuilderContext;
+import org.apache.sling.feature.support.process.FeatureProvider;
+import org.apache.sling.feature.support.process.FeatureResolver;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/featuremodel/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java b/featuremodel/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
index d4e70e2..8194698 100644
--- a/featuremodel/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
+++ b/featuremodel/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
@@ -30,13 +30,13 @@
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.launcher.impl.LauncherConfig.StartupMode;
-import org.apache.sling.feature.process.FeatureResolver;
import org.apache.sling.feature.resolver.FrameworkResolver;
import org.apache.sling.feature.support.ArtifactHandler;
import org.apache.sling.feature.support.ArtifactManager;
import org.apache.sling.feature.support.FeatureUtil;
import org.apache.sling.feature.support.json.ApplicationJSONReader;
import org.apache.sling.feature.support.json.ApplicationJSONWriter;
+import org.apache.sling.feature.support.process.FeatureResolver;
public class FeatureProcessor {
diff --git a/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/FeatureToProvisioning.java b/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/FeatureToProvisioning.java
index 04b8428..4c7089e 100644
--- a/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/FeatureToProvisioning.java
+++ b/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/FeatureToProvisioning.java
@@ -24,11 +24,11 @@
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.KeyValueMap;
-import org.apache.sling.feature.process.FeatureResolver;
import org.apache.sling.feature.support.ArtifactManager;
import org.apache.sling.feature.support.FeatureUtil;
import org.apache.sling.feature.support.json.ApplicationJSONReader;
import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
+import org.apache.sling.feature.support.process.FeatureResolver;
import org.apache.sling.provisioning.model.Artifact;
import org.apache.sling.provisioning.model.Configuration;
import org.apache.sling.provisioning.model.Feature;
diff --git a/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java b/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java
index 77a1a51..dccf74b 100644
--- a/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java
+++ b/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java
@@ -22,11 +22,11 @@
import org.apache.sling.feature.FeatureResource;
import org.apache.sling.feature.analyser.BundleDescriptor;
import org.apache.sling.feature.analyser.impl.BundleDescriptorImpl;
-import org.apache.sling.feature.process.FeatureResolver;
import org.apache.sling.feature.resolver.impl.BundleResourceImpl;
import org.apache.sling.feature.resolver.impl.FeatureResourceImpl;
import org.apache.sling.feature.resolver.impl.ResolveContextImpl;
import org.apache.sling.feature.support.ArtifactManager;
+import org.apache.sling.feature.support.process.FeatureResolver;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
diff --git a/featuremodel/feature-resolver/src/test/java/org/apache/sling/feature/resolver/FrameworkResolverTest.java b/featuremodel/feature-resolver/src/test/java/org/apache/sling/feature/resolver/FrameworkResolverTest.java
index fa947ca..0617237 100644
--- a/featuremodel/feature-resolver/src/test/java/org/apache/sling/feature/resolver/FrameworkResolverTest.java
+++ b/featuremodel/feature-resolver/src/test/java/org/apache/sling/feature/resolver/FrameworkResolverTest.java
@@ -18,12 +18,12 @@
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.FeatureResource;
-import org.apache.sling.feature.process.FeatureResolver;
import org.apache.sling.feature.support.ArtifactHandler;
import org.apache.sling.feature.support.ArtifactManager;
import org.apache.sling.feature.support.ArtifactManagerConfig;
import org.apache.sling.feature.support.json.FeatureJSONReader;
import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
+import org.apache.sling.feature.support.process.FeatureResolver;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
index 7c53d79..6cbdf69 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
@@ -19,12 +19,12 @@
import org.apache.sling.feature.Application;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.process.ApplicationBuilder;
-import org.apache.sling.feature.process.BuilderContext;
-import org.apache.sling.feature.process.FeatureProvider;
-import org.apache.sling.feature.process.FeatureResolver;
import org.apache.sling.feature.support.json.FeatureJSONReader;
import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
+import org.apache.sling.feature.support.process.ApplicationBuilder;
+import org.apache.sling.feature.support.process.BuilderContext;
+import org.apache.sling.feature.support.process.FeatureProvider;
+import org.apache.sling.feature.support.process.FeatureResolver;
import java.io.File;
import java.io.FileReader;
diff --git a/featuremodel/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/ApplicationBuilder.java
similarity index 99%
rename from featuremodel/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/ApplicationBuilder.java
index 71fc8b0..9141231 100644
--- a/featuremodel/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/ApplicationBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.process;
+package org.apache.sling.feature.support.process;
import org.apache.sling.feature.Application;
import org.apache.sling.feature.Artifact;
diff --git a/featuremodel/feature/src/main/java/org/apache/sling/feature/process/BuilderContext.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/BuilderContext.java
similarity index 97%
rename from featuremodel/feature/src/main/java/org/apache/sling/feature/process/BuilderContext.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/BuilderContext.java
index 024076d..f44ad3b 100644
--- a/featuremodel/feature/src/main/java/org/apache/sling/feature/process/BuilderContext.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/BuilderContext.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.process;
+package org.apache.sling.feature.support.process;
import java.util.ArrayList;
import java.util.List;
diff --git a/featuremodel/feature/src/main/java/org/apache/sling/feature/process/BuilderUtil.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/BuilderUtil.java
similarity index 99%
rename from featuremodel/feature/src/main/java/org/apache/sling/feature/process/BuilderUtil.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/BuilderUtil.java
index 90da88e..d3943e9 100644
--- a/featuremodel/feature/src/main/java/org/apache/sling/feature/process/BuilderUtil.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/BuilderUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.process;
+package org.apache.sling.feature.support.process;
import java.io.StringReader;
import java.util.Enumeration;
diff --git a/featuremodel/feature/src/main/java/org/apache/sling/feature/process/FeatureBuilder.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureBuilder.java
similarity index 99%
rename from featuremodel/feature/src/main/java/org/apache/sling/feature/process/FeatureBuilder.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureBuilder.java
index 6d57dc6..e0475a4 100644
--- a/featuremodel/feature/src/main/java/org/apache/sling/feature/process/FeatureBuilder.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.process;
+package org.apache.sling.feature.support.process;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/featuremodel/feature/src/main/java/org/apache/sling/feature/process/FeatureExtensionHandler.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureExtensionHandler.java
similarity index 97%
rename from featuremodel/feature/src/main/java/org/apache/sling/feature/process/FeatureExtensionHandler.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureExtensionHandler.java
index c2a9460..297f5c3 100644
--- a/featuremodel/feature/src/main/java/org/apache/sling/feature/process/FeatureExtensionHandler.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureExtensionHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.process;
+package org.apache.sling.feature.support.process;
import org.apache.sling.feature.Feature;
diff --git a/featuremodel/feature/src/main/java/org/apache/sling/feature/process/FeatureProvider.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureProvider.java
similarity index 95%
rename from featuremodel/feature/src/main/java/org/apache/sling/feature/process/FeatureProvider.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureProvider.java
index 8d3c35a..350c222 100644
--- a/featuremodel/feature/src/main/java/org/apache/sling/feature/process/FeatureProvider.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureProvider.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.process;
+package org.apache.sling.feature.support.process;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
diff --git a/featuremodel/feature/src/main/java/org/apache/sling/feature/process/FeatureResolver.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureResolver.java
similarity index 96%
rename from featuremodel/feature/src/main/java/org/apache/sling/feature/process/FeatureResolver.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureResolver.java
index 5fbba7c..dfe9366 100644
--- a/featuremodel/feature/src/main/java/org/apache/sling/feature/process/FeatureResolver.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureResolver.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.process;
+package org.apache.sling.feature.support.process;
import java.util.List;
diff --git a/featuremodel/feature/src/main/java/org/apache/sling/feature/process/package-info.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/package-info.java
similarity index 94%
rename from featuremodel/feature/src/main/java/org/apache/sling/feature/process/package-info.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/package-info.java
index f6d563a..bf380fc 100644
--- a/featuremodel/feature/src/main/java/org/apache/sling/feature/process/package-info.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/package-info.java
@@ -18,6 +18,6 @@
*/
@org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.feature.process;
+package org.apache.sling.feature.support.process;
diff --git a/featuremodel/feature/src/test/java/org/apache/sling/feature/process/BuilderUtilTest.java b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/process/BuilderUtilTest.java
similarity index 76%
rename from featuremodel/feature/src/test/java/org/apache/sling/feature/process/BuilderUtilTest.java
rename to featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/process/BuilderUtilTest.java
index 42ce069..cf76eb6 100644
--- a/featuremodel/feature/src/test/java/org/apache/sling/feature/process/BuilderUtilTest.java
+++ b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/process/BuilderUtilTest.java
@@ -14,21 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.process;
+package org.apache.sling.feature.support.process;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.apache.sling.feature.Artifact;
+import org.apache.sling.feature.ArtifactId;
+import org.apache.sling.feature.Bundles;
+import org.apache.sling.feature.support.process.BuilderUtil;
+import org.apache.sling.feature.support.process.BuilderUtil.ArtifactMerge;
+import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.sling.feature.Artifact;
-import org.apache.sling.feature.ArtifactId;
-import org.apache.sling.feature.Bundles;
-import org.apache.sling.feature.BundlesTest;
-import org.apache.sling.feature.process.BuilderUtil.ArtifactMerge;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
public class BuilderUtilTest {
@@ -73,14 +73,14 @@ private void assertContains(final List<Map.Entry<Integer, Artifact>> bundles,
@Test public void testMergeBundlesWithAlgHighest() {
final Bundles target = new Bundles();
- target.add(BundlesTest.createBundle("g/a/1.0", 1));
- target.add(BundlesTest.createBundle("g/b/2.0", 2));
- target.add(BundlesTest.createBundle("g/c/2.5", 3));
+ target.add(createBundle("g/a/1.0", 1));
+ target.add(createBundle("g/b/2.0", 2));
+ target.add(createBundle("g/c/2.5", 3));
final Bundles source = new Bundles();
- source.add(BundlesTest.createBundle("g/a/1.1", 1));
- source.add(BundlesTest.createBundle("g/b/1.9", 2));
- source.add(BundlesTest.createBundle("g/c/2.5", 3));
+ source.add(createBundle("g/a/1.1", 1));
+ source.add(createBundle("g/b/1.9", 2));
+ source.add(createBundle("g/c/2.5", 3));
BuilderUtil.mergeBundles(target, source, ArtifactMerge.HIGHEST);
@@ -94,14 +94,14 @@ private void assertContains(final List<Map.Entry<Integer, Artifact>> bundles,
@Test public void testMergeBundlesWithAlgLatest() {
final Bundles target = new Bundles();
- target.add(BundlesTest.createBundle("g/a/1.0", 1));
- target.add(BundlesTest.createBundle("g/b/2.0", 2));
- target.add(BundlesTest.createBundle("g/c/2.5", 3));
+ target.add(createBundle("g/a/1.0", 1));
+ target.add(createBundle("g/b/2.0", 2));
+ target.add(createBundle("g/c/2.5", 3));
final Bundles source = new Bundles();
- source.add(BundlesTest.createBundle("g/a/1.1", 1));
- source.add(BundlesTest.createBundle("g/b/1.9", 2));
- source.add(BundlesTest.createBundle("g/c/2.5", 3));
+ source.add(createBundle("g/a/1.1", 1));
+ source.add(createBundle("g/b/1.9", 2));
+ source.add(createBundle("g/c/2.5", 3));
BuilderUtil.mergeBundles(target, source, ArtifactMerge.LATEST);
@@ -115,10 +115,10 @@ private void assertContains(final List<Map.Entry<Integer, Artifact>> bundles,
@Test public void testMergeBundlesDifferentStartlevel() {
final Bundles target = new Bundles();
- target.add(BundlesTest.createBundle("g/a/1.0", 1));
+ target.add(createBundle("g/a/1.0", 1));
final Bundles source = new Bundles();
- source.add(BundlesTest.createBundle("g/a/1.1", 2));
+ source.add(createBundle("g/a/1.1", 2));
BuilderUtil.mergeBundles(target, source, ArtifactMerge.LATEST);
@@ -130,14 +130,14 @@ private void assertContains(final List<Map.Entry<Integer, Artifact>> bundles,
@Test public void testMergeBundles() {
final Bundles target = new Bundles();
- target.add(BundlesTest.createBundle("g/a/1.0", 1));
- target.add(BundlesTest.createBundle("g/b/2.0", 2));
- target.add(BundlesTest.createBundle("g/c/2.5", 3));
+ target.add(createBundle("g/a/1.0", 1));
+ target.add(createBundle("g/b/2.0", 2));
+ target.add(createBundle("g/c/2.5", 3));
final Bundles source = new Bundles();
- source.add(BundlesTest.createBundle("g/d/1.1", 1));
- source.add(BundlesTest.createBundle("g/e/1.9", 2));
- source.add(BundlesTest.createBundle("g/f/2.5", 3));
+ source.add(createBundle("g/d/1.1", 1));
+ source.add(createBundle("g/e/1.9", 2));
+ source.add(createBundle("g/f/2.5", 3));
BuilderUtil.mergeBundles(target, source, ArtifactMerge.LATEST);
@@ -150,4 +150,11 @@ private void assertContains(final List<Map.Entry<Integer, Artifact>> bundles,
assertContains(result, 2, ArtifactId.parse("g/e/1.9"));
assertContains(result, 3, ArtifactId.parse("g/f/2.5"));
}
+
+ public static Artifact createBundle(final String id, final int startOrder) {
+ final Artifact a = new Artifact(ArtifactId.parse(id));
+ a.getMetadata().put(Artifact.KEY_START_ORDER, String.valueOf(startOrder));
+
+ return a;
+ }
}
diff --git a/featuremodel/feature/src/test/java/org/apache/sling/feature/process/FeatureBuilderTest.java b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/process/FeatureBuilderTest.java
similarity index 87%
rename from featuremodel/feature/src/test/java/org/apache/sling/feature/process/FeatureBuilderTest.java
rename to featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/process/FeatureBuilderTest.java
index ca27cf5..ddb258b 100644
--- a/featuremodel/feature/src/test/java/org/apache/sling/feature/process/FeatureBuilderTest.java
+++ b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/process/FeatureBuilderTest.java
@@ -14,32 +14,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.process;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+package org.apache.sling.feature.support.process;
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.ArtifactId;
-import org.apache.sling.feature.BundlesTest;
import org.apache.sling.feature.Configuration;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.Include;
import org.apache.sling.feature.OSGiCapability;
import org.apache.sling.feature.OSGiRequirement;
+import org.apache.sling.feature.support.process.BuilderContext;
+import org.apache.sling.feature.support.process.FeatureBuilder;
+import org.apache.sling.feature.support.process.FeatureProvider;
import org.junit.Test;
import org.osgi.resource.Capability;
import org.osgi.resource.Requirement;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class FeatureBuilderTest {
private static final Map<String, Feature> FEATURES = new HashMap<>();
@@ -50,11 +52,11 @@
f1.getFrameworkProperties().put("foo", "2");
f1.getFrameworkProperties().put("bar", "X");
- f1.getBundles().add(BundlesTest.createBundle("org.apache.sling/foo-bar/4.5.6", 3));
- f1.getBundles().add(BundlesTest.createBundle("group/testnewversion_low/2", 5));
- f1.getBundles().add(BundlesTest.createBundle("group/testnewversion_high/2", 5));
- f1.getBundles().add(BundlesTest.createBundle("group/testnewstartlevel/1", 5));
- f1.getBundles().add(BundlesTest.createBundle("group/testnewstartlevelandversion/1", 5));
+ f1.getBundles().add(BuilderUtilTest.createBundle("org.apache.sling/foo-bar/4.5.6", 3));
+ f1.getBundles().add(BuilderUtilTest.createBundle("group/testnewversion_low/2", 5));
+ f1.getBundles().add(BuilderUtilTest.createBundle("group/testnewversion_high/2", 5));
+ f1.getBundles().add(BuilderUtilTest.createBundle("group/testnewstartlevel/1", 5));
+ f1.getBundles().add(BuilderUtilTest.createBundle("group/testnewstartlevelandversion/1", 5));
final Configuration c1 = new Configuration("org.apache.sling.foo");
c1.getProperties().put("prop", "value");
@@ -219,9 +221,9 @@ private void equals(final Feature expected, final Feature actuals) {
a1.getMetadata().put(Artifact.KEY_START_ORDER, "1");
a1.getMetadata().put("hash", "4632463464363646436");
base.getBundles().add(a1);
- base.getBundles().add(BundlesTest.createBundle("org.apache.sling/application-bundle/2.0.0", 1));
- base.getBundles().add(BundlesTest.createBundle("org.apache.sling/another-bundle/2.1.0", 1));
- base.getBundles().add(BundlesTest.createBundle("org.apache.sling/foo-xyz/1.2.3", 2));
+ base.getBundles().add(BuilderUtilTest.createBundle("org.apache.sling/application-bundle/2.0.0", 1));
+ base.getBundles().add(BuilderUtilTest.createBundle("org.apache.sling/another-bundle/2.1.0", 1));
+ base.getBundles().add(BuilderUtilTest.createBundle("org.apache.sling/foo-xyz/1.2.3", 2));
final Configuration co1 = new Configuration("my.pid");
co1.getProperties().put("foo", 5L);
@@ -264,13 +266,13 @@ private void equals(final Feature expected, final Feature actuals) {
a1.getMetadata().put(Artifact.KEY_START_ORDER, "1");
a1.getMetadata().put("hash", "4632463464363646436");
base.getBundles().add(a1);
- base.getBundles().add(BundlesTest.createBundle("org.apache.sling/application-bundle/2.0.0", 1));
- base.getBundles().add(BundlesTest.createBundle("org.apache.sling/another-bundle/2.1.0", 1));
- base.getBundles().add(BundlesTest.createBundle("org.apache.sling/foo-xyz/1.2.3", 2));
- base.getBundles().add(BundlesTest.createBundle("group/testnewversion_low/1", 5));
- base.getBundles().add(BundlesTest.createBundle("group/testnewversion_high/5", 5));
- base.getBundles().add(BundlesTest.createBundle("group/testnewstartlevel/1", 10));
- base.getBundles().add(BundlesTest.createBundle("group/testnewstartlevelandversion/2", 10));
+ base.getBundles().add(BuilderUtilTest.createBundle("org.apache.sling/application-bundle/2.0.0", 1));
+ base.getBundles().add(BuilderUtilTest.createBundle("org.apache.sling/another-bundle/2.1.0", 1));
+ base.getBundles().add(BuilderUtilTest.createBundle("org.apache.sling/foo-xyz/1.2.3", 2));
+ base.getBundles().add(BuilderUtilTest.createBundle("group/testnewversion_low/1", 5));
+ base.getBundles().add(BuilderUtilTest.createBundle("group/testnewversion_high/5", 5));
+ base.getBundles().add(BuilderUtilTest.createBundle("group/testnewstartlevel/1", 10));
+ base.getBundles().add(BuilderUtilTest.createBundle("group/testnewstartlevelandversion/2", 10));
final Configuration co1 = new Configuration("my.pid");
co1.getProperties().put("foo", 5L);
@@ -288,7 +290,7 @@ private void equals(final Feature expected, final Feature actuals) {
final Feature result = base.copy();
result.getIncludes().remove(0);
result.getFrameworkProperties().put("bar", "X");
- result.getBundles().add(BundlesTest.createBundle("org.apache.sling/foo-bar/4.5.6", 3));
+ result.getBundles().add(BuilderUtilTest.createBundle("org.apache.sling/foo-bar/4.5.6", 3));
final Configuration co3 = new Configuration("org.apache.sling.foo");
co3.getProperties().put("prop", "value");
result.getConfigurations().add(co3);
diff --git a/featuremodel/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java b/featuremodel/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
index 4e2f08b..65191a2 100644
--- a/featuremodel/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
+++ b/featuremodel/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
@@ -23,12 +23,12 @@
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.process.BuilderContext;
-import org.apache.sling.feature.process.FeatureBuilder;
-import org.apache.sling.feature.process.FeatureProvider;
import org.apache.sling.feature.support.FeatureUtil;
import org.apache.sling.feature.support.json.FeatureJSONReader;
import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
+import org.apache.sling.feature.support.process.BuilderContext;
+import org.apache.sling.feature.support.process.FeatureBuilder;
+import org.apache.sling.feature.support.process.FeatureProvider;
import org.codehaus.plexus.logging.Logger;
import java.io.File;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services