[sling-whiteboard] branch master updated: Move FeatureResource to support package.

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 351455d  Move FeatureResource to support package.
351455d is described below

commit 351455dce06e3abc5c23d1ca84a0141dd9ce6c54
Author: David Bosschaert <da...@gmail.com>
AuthorDate: Tue Apr 17 09:45:11 2018 +0300

    Move FeatureResource to support package.
---
 .../src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java | 2 +-
 .../org/apache/sling/feature/analyser/TestBundleResourceImpl.java     | 2 +-
 .../java/org/apache/sling/feature/resolver/FrameworkResolver.java     | 2 +-
 .../org/apache/sling/feature/resolver/impl/BundleResourceImpl.java    | 2 +-
 .../org/apache/sling/feature/resolver/impl/FeatureResourceImpl.java   | 2 +-
 .../java/org/apache/sling/feature/resolver/FrameworkResolverTest.java | 2 +-
 .../apache/sling/feature/resolver/impl/BundleResourceImplTest.java    | 2 +-
 .../org/apache/sling/feature/support/process/ApplicationBuilder.java  | 1 -
 .../org/apache/sling/feature/support/process/FeatureResolver.java     | 1 -
 .../org/apache/sling/feature/support/process}/FeatureResource.java    | 4 +++-
 10 files changed, 10 insertions(+), 10 deletions(-)

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 e8b27fa..213ac63 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
@@ -19,7 +19,6 @@ package org.apache.sling.feature.analyser;
 import org.apache.sling.feature.Application;
 import org.apache.sling.feature.Artifact;
 import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureResource;
 import org.apache.sling.feature.analyser.impl.BundleDescriptorImpl;
 import org.apache.sling.feature.analyser.service.Analyser;
 import org.apache.sling.feature.analyser.service.Scanner;
@@ -29,6 +28,7 @@ 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.apache.sling.feature.support.process.FeatureResource;
 import org.junit.Test;
 
 import java.io.File;
diff --git a/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/TestBundleResourceImpl.java b/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/TestBundleResourceImpl.java
index c06affe..2fd7962 100644
--- a/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/TestBundleResourceImpl.java
+++ b/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/TestBundleResourceImpl.java
@@ -18,9 +18,9 @@ package org.apache.sling.feature.analyser;
 
 import org.apache.sling.feature.Artifact;
 import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureResource;
 import org.apache.sling.feature.OSGiCapability;
 import org.apache.sling.feature.OSGiRequirement;
+import org.apache.sling.feature.support.process.FeatureResource;
 import org.apache.sling.feature.support.util.PackageInfo;
 import org.osgi.framework.Version;
 import org.osgi.framework.VersionRange;
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 dccf74b..83767b2 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
@@ -19,7 +19,6 @@ package org.apache.sling.feature.resolver;
 import org.apache.sling.feature.Artifact;
 import org.apache.sling.feature.ArtifactId;
 import org.apache.sling.feature.Feature;
-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.resolver.impl.BundleResourceImpl;
@@ -27,6 +26,7 @@ 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.apache.sling.feature.support.process.FeatureResource;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
diff --git a/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/impl/BundleResourceImpl.java b/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/impl/BundleResourceImpl.java
index 5053a1d..e6e061a 100644
--- a/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/impl/BundleResourceImpl.java
+++ b/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/impl/BundleResourceImpl.java
@@ -18,10 +18,10 @@ package org.apache.sling.feature.resolver.impl;
 
 import org.apache.sling.feature.Artifact;
 import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureResource;
 import org.apache.sling.feature.OSGiCapability;
 import org.apache.sling.feature.OSGiRequirement;
 import org.apache.sling.feature.analyser.BundleDescriptor;
+import org.apache.sling.feature.support.process.FeatureResource;
 import org.apache.sling.feature.support.util.PackageInfo;
 import org.osgi.framework.Version;
 import org.osgi.framework.VersionRange;
diff --git a/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/impl/FeatureResourceImpl.java b/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/impl/FeatureResourceImpl.java
index dc5c6b9..4b0c145 100644
--- a/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/impl/FeatureResourceImpl.java
+++ b/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/impl/FeatureResourceImpl.java
@@ -18,9 +18,9 @@ package org.apache.sling.feature.resolver.impl;
 
 import org.apache.sling.feature.Artifact;
 import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureResource;
 import org.apache.sling.feature.OSGiCapability;
 import org.apache.sling.feature.OSGiRequirement;
+import org.apache.sling.feature.support.process.FeatureResource;
 import org.osgi.framework.Version;
 import org.osgi.framework.namespace.IdentityNamespace;
 import org.osgi.resource.Capability;
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 0617237..093b873 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
@@ -17,13 +17,13 @@
 package org.apache.sling.feature.resolver;
 
 import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureResource;
 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.apache.sling.feature.support.process.FeatureResource;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/featuremodel/feature-resolver/src/test/java/org/apache/sling/feature/resolver/impl/BundleResourceImplTest.java b/featuremodel/feature-resolver/src/test/java/org/apache/sling/feature/resolver/impl/BundleResourceImplTest.java
index 68f572e..cbc9ff1 100644
--- a/featuremodel/feature-resolver/src/test/java/org/apache/sling/feature/resolver/impl/BundleResourceImplTest.java
+++ b/featuremodel/feature-resolver/src/test/java/org/apache/sling/feature/resolver/impl/BundleResourceImplTest.java
@@ -19,12 +19,12 @@ package org.apache.sling.feature.resolver.impl;
 import org.apache.sling.feature.Artifact;
 import org.apache.sling.feature.ArtifactId;
 import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureResource;
 import org.apache.sling.feature.OSGiCapability;
 import org.apache.sling.feature.OSGiRequirement;
 import org.apache.sling.feature.analyser.BundleDescriptor;
 import org.apache.sling.feature.analyser.Descriptor;
 import org.apache.sling.feature.analyser.impl.BundleDescriptorImpl;
+import org.apache.sling.feature.support.process.FeatureResource;
 import org.apache.sling.feature.support.util.PackageInfo;
 import org.junit.Test;
 import org.mockito.Mockito;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/ApplicationBuilder.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/ApplicationBuilder.java
index 9141231..c3907d8 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/ApplicationBuilder.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/ApplicationBuilder.java
@@ -20,7 +20,6 @@ import org.apache.sling.feature.Application;
 import org.apache.sling.feature.Artifact;
 import org.apache.sling.feature.ArtifactId;
 import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureResource;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureResolver.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureResolver.java
index dfe9366..dead887 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureResolver.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureResolver.java
@@ -19,7 +19,6 @@ package org.apache.sling.feature.support.process;
 import java.util.List;
 
 import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureResource;
 
 /**
  * A resolver that can perform operations on the feature model.
diff --git a/featuremodel/feature/src/main/java/org/apache/sling/feature/FeatureResource.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureResource.java
similarity index 92%
rename from featuremodel/feature/src/main/java/org/apache/sling/feature/FeatureResource.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureResource.java
index 38b0b43..17594ca 100644
--- a/featuremodel/feature/src/main/java/org/apache/sling/feature/FeatureResource.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureResource.java
@@ -14,8 +14,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.sling.feature;
+package org.apache.sling.feature.support.process;
 
+import org.apache.sling.feature.Artifact;
+import org.apache.sling.feature.Feature;
 import org.osgi.framework.Version;
 import org.osgi.resource.Resource;
 

-- 
To stop receiving notification emails like this one, please contact
davidb@apache.org.