You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2018/04/27 09:53:28 UTC
[sling-org-apache-sling-feature-analyser] 12/28: Move artifact
handling to separate package
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-org-apache-sling-feature-analyser.git
commit 11798eab06c557ba014b725d359b7c220e487970
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Apr 17 09:51:30 2018 +0200
Move artifact handling to separate package
---
src/main/java/org/apache/sling/feature/analyser/main/Main.java | 2 +-
src/main/java/org/apache/sling/feature/analyser/service/Scanner.java | 4 ++--
src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java | 2 +-
.../sling/feature/scanner/impl/ContentPackagesExtensionScanner.java | 2 +-
.../java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java | 2 +-
src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/analyser/main/Main.java b/src/main/java/org/apache/sling/feature/analyser/main/Main.java
index 37c7548..449aa53 100644
--- a/src/main/java/org/apache/sling/feature/analyser/main/Main.java
+++ b/src/main/java/org/apache/sling/feature/analyser/main/Main.java
@@ -19,8 +19,8 @@ package org.apache.sling.feature.analyser.main;
import org.apache.sling.feature.Application;
import org.apache.sling.feature.analyser.service.Analyser;
import org.apache.sling.feature.analyser.service.Scanner;
-import org.apache.sling.feature.support.ArtifactManagerConfig;
import org.apache.sling.feature.support.FeatureUtil;
+import org.apache.sling.feature.support.artifact.ArtifactManagerConfig;
import org.apache.sling.feature.support.json.ApplicationJSONReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/sling/feature/analyser/service/Scanner.java b/src/main/java/org/apache/sling/feature/analyser/service/Scanner.java
index e60ad58..465b73d 100644
--- a/src/main/java/org/apache/sling/feature/analyser/service/Scanner.java
+++ b/src/main/java/org/apache/sling/feature/analyser/service/Scanner.java
@@ -38,8 +38,8 @@ import org.apache.sling.feature.analyser.impl.BundleDescriptorImpl;
import org.apache.sling.feature.analyser.impl.FeatureDescriptorImpl;
import org.apache.sling.feature.scanner.ExtensionScanner;
import org.apache.sling.feature.scanner.FrameworkScanner;
-import org.apache.sling.feature.support.ArtifactManager;
-import org.apache.sling.feature.support.ArtifactManagerConfig;
+import org.apache.sling.feature.support.artifact.ArtifactManager;
+import org.apache.sling.feature.support.artifact.ArtifactManagerConfig;
/**
* The scanner is a service that scans items and provides descriptions for these.
diff --git a/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java b/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java
index ca5f6cb..308c8e0 100644
--- a/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java
+++ b/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.analyser.ContainerDescriptor;
-import org.apache.sling.feature.support.ArtifactManager;
+import org.apache.sling.feature.support.artifact.ArtifactManager;
import org.osgi.annotation.versioning.ConsumerType;
/**
diff --git a/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackagesExtensionScanner.java b/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackagesExtensionScanner.java
index 5c91554..ec799be 100644
--- a/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackagesExtensionScanner.java
+++ b/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackagesExtensionScanner.java
@@ -25,7 +25,7 @@ import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.analyser.ContainerDescriptor;
import org.apache.sling.feature.scanner.ExtensionScanner;
-import org.apache.sling.feature.support.ArtifactManager;
+import org.apache.sling.feature.support.artifact.ArtifactManager;
public class ContentPackagesExtensionScanner implements ExtensionScanner {
diff --git a/src/main/java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java b/src/main/java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java
index d3cf11c..cd9c58a 100644
--- a/src/main/java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java
+++ b/src/main/java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java
@@ -24,7 +24,7 @@ import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.OSGiRequirement;
import org.apache.sling.feature.analyser.ContainerDescriptor;
import org.apache.sling.feature.scanner.ExtensionScanner;
-import org.apache.sling.feature.support.ArtifactManager;
+import org.apache.sling.feature.support.artifact.ArtifactManager;
import org.osgi.resource.Requirement;
public class RepoInitScanner implements ExtensionScanner {
diff --git a/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java b/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
index d6f65b7..f6a0cf0 100644
--- a/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
+++ b/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
@@ -22,9 +22,9 @@ import org.apache.sling.feature.Feature;
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.support.ArtifactManager;
-import org.apache.sling.feature.support.ArtifactManagerConfig;
import org.apache.sling.feature.support.FeatureUtil;
+import org.apache.sling.feature.support.artifact.ArtifactManager;
+import org.apache.sling.feature.support.artifact.ArtifactManagerConfig;
import org.apache.sling.feature.support.json.FeatureJSONReader;
import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
import org.apache.sling.feature.support.resolver.FeatureResolver;
--
To stop receiving notification emails like this one, please contact
davidb@apache.org.