You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2018/04/17 07:51:36 UTC
[sling-whiteboard] branch master updated: Move artifact handling to
separate package
This is an automated email from the ASF dual-hosted git repository.
cziegeler 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 d7eefdc Move artifact handling to separate package
d7eefdc is described below
commit d7eefdc23287c1143f1753317de11798d1b1957b
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Apr 17 09:51:30 2018 +0200
Move artifact handling to separate package
---
.../apache/sling/feature/analyser/main/Main.java | 2 +-
.../sling/feature/analyser/service/Scanner.java | 4 ++--
.../sling/feature/scanner/ExtensionScanner.java | 2 +-
.../impl/ContentPackagesExtensionScanner.java | 2 +-
.../feature/scanner/impl/RepoInitScanner.java | 2 +-
.../sling/feature/analyser/AnalyserTest.java | 4 ++--
.../feature/applicationbuilder/impl/Main.java | 4 ++--
.../impl/ApplicationBuilderTest.java | 6 +++---
.../sling/feature/karaf/KarafFeatureWriter.java | 4 ++--
.../feature/launcher/impl/FeatureProcessor.java | 4 ++--
.../feature/launcher/impl/LauncherConfig.java | 4 ++--
.../apache/sling/feature/launcher/impl/Main.java | 4 ++--
.../modelconverter/impl/FeatureToProvisioning.java | 2 +-
.../sling/feature/modelconverter/impl/Main.java | 4 ++--
.../modelconverter/impl/ProvisioningToFeature.java | 6 +++---
.../modelconverter/impl/ModelConverterTest.java | 4 ++--
.../sling/feature/resolver/FrameworkResolver.java | 2 +-
.../feature/resolver/FrameworkResolverTest.java | 6 +++---
.../apache/sling/feature/support/FeatureUtil.java | 2 ++
.../support/{ => artifact}/ArtifactHandler.java | 2 +-
.../support/{ => artifact}/ArtifactManager.java | 6 +++---
.../{ => artifact}/ArtifactManagerConfig.java | 22 +++++++++++++++++++---
.../support/{spi => artifact}/package-info.java | 2 +-
.../{ => artifact}/spi/ArtifactProvider.java | 2 +-
.../spi/ArtifactProviderContext.java | 2 +-
.../support/{ => artifact}/spi/package-info.java | 2 +-
.../{ => artifact}/ArtifactManagerTest.java | 7 +++++--
27 files changed, 67 insertions(+), 46 deletions(-)
diff --git a/featuremodel/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java b/featuremodel/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java
index 37c7548..449aa53 100644
--- a/featuremodel/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java
+++ b/featuremodel/feature-analyser/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/featuremodel/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/Scanner.java b/featuremodel/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/Scanner.java
index e60ad58..465b73d 100644
--- a/featuremodel/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/Scanner.java
+++ b/featuremodel/feature-analyser/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/featuremodel/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java b/featuremodel/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java
index ca5f6cb..308c8e0 100644
--- a/featuremodel/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java
+++ b/featuremodel/feature-analyser/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/featuremodel/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackagesExtensionScanner.java b/featuremodel/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackagesExtensionScanner.java
index 5c91554..ec799be 100644
--- a/featuremodel/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackagesExtensionScanner.java
+++ b/featuremodel/feature-analyser/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/featuremodel/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java b/featuremodel/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java
index d3cf11c..cd9c58a 100644
--- a/featuremodel/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java
+++ b/featuremodel/feature-analyser/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/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 d6f65b7..f6a0cf0 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
@@ -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;
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 fc9b591..2c38faa 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
@@ -25,9 +25,9 @@ import org.apache.commons.cli.ParseException;
import org.apache.sling.feature.Application;
import org.apache.sling.feature.ArtifactId;
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.artifact.ArtifactManager;
+import org.apache.sling.feature.support.artifact.ArtifactManagerConfig;
import org.apache.sling.feature.support.json.ApplicationJSONWriter;
import org.apache.sling.feature.support.resolver.FeatureResolver;
import org.slf4j.Logger;
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 f0532e5..ee4bc13 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
@@ -40,10 +40,10 @@ import org.apache.sling.feature.Application;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
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.ArtifactManagerConfig;
import org.apache.sling.feature.support.FeatureUtil;
+import org.apache.sling.feature.support.artifact.ArtifactHandler;
+import org.apache.sling.feature.support.artifact.ArtifactManager;
+import org.apache.sling.feature.support.artifact.ArtifactManagerConfig;
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;
diff --git a/featuremodel/feature-karaf/src/main/java/org/apache/sling/feature/karaf/KarafFeatureWriter.java b/featuremodel/feature-karaf/src/main/java/org/apache/sling/feature/karaf/KarafFeatureWriter.java
index d2e805a..38e0f74 100644
--- a/featuremodel/feature-karaf/src/main/java/org/apache/sling/feature/karaf/KarafFeatureWriter.java
+++ b/featuremodel/feature-karaf/src/main/java/org/apache/sling/feature/karaf/KarafFeatureWriter.java
@@ -37,9 +37,9 @@ import org.apache.sling.feature.Configuration;
import org.apache.sling.feature.Configurations;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.support.ArtifactHandler;
-import org.apache.sling.feature.support.ArtifactManager;
import org.apache.sling.feature.support.ConfigurationUtil;
+import org.apache.sling.feature.support.artifact.ArtifactHandler;
+import org.apache.sling.feature.support.artifact.ArtifactManager;
/**
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 99d3c47..af52852 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
@@ -31,9 +31,9 @@ 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.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.artifact.ArtifactHandler;
+import org.apache.sling.feature.support.artifact.ArtifactManager;
import org.apache.sling.feature.support.json.ApplicationJSONReader;
import org.apache.sling.feature.support.json.ApplicationJSONWriter;
import org.apache.sling.feature.support.resolver.FeatureResolver;
diff --git a/featuremodel/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/LauncherConfig.java b/featuremodel/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/LauncherConfig.java
index 56095b9..9737ca9 100644
--- a/featuremodel/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/LauncherConfig.java
+++ b/featuremodel/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/LauncherConfig.java
@@ -16,8 +16,8 @@
*/
package org.apache.sling.feature.launcher.impl;
-import org.apache.sling.feature.support.ArtifactManagerConfig;
-import org.apache.sling.feature.support.spi.ArtifactProviderContext;
+import org.apache.sling.feature.support.artifact.ArtifactManagerConfig;
+import org.apache.sling.feature.support.artifact.spi.ArtifactProviderContext;
import java.io.File;
import java.io.IOException;
diff --git a/featuremodel/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java b/featuremodel/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
index 31050fe..7a7f48d 100644
--- a/featuremodel/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
+++ b/featuremodel/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
@@ -36,8 +36,8 @@ import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.launcher.impl.launchers.FrameworkLauncher;
import org.apache.sling.feature.launcher.spi.Launcher;
import org.apache.sling.feature.launcher.spi.LauncherPrepareContext;
-import org.apache.sling.feature.support.ArtifactHandler;
-import org.apache.sling.feature.support.ArtifactManager;
+import org.apache.sling.feature.support.artifact.ArtifactHandler;
+import org.apache.sling.feature.support.artifact.ArtifactManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 cf5a3a5..018f99c 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,8 +24,8 @@ import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.KeyValueMap;
-import org.apache.sling.feature.support.ArtifactManager;
import org.apache.sling.feature.support.FeatureUtil;
+import org.apache.sling.feature.support.artifact.ArtifactManager;
import org.apache.sling.feature.support.json.ApplicationJSONReader;
import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
import org.apache.sling.feature.support.resolver.FeatureResolver;
diff --git a/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java b/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
index 81a9e3c..abf7bfb 100644
--- a/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
+++ b/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
@@ -22,8 +22,8 @@ import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/ProvisioningToFeature.java b/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/ProvisioningToFeature.java
index ce77d76..1f8ce87 100644
--- a/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/ProvisioningToFeature.java
+++ b/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/ProvisioningToFeature.java
@@ -24,10 +24,10 @@ import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.KeyValueMap;
-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.FeatureUtil;
+import org.apache.sling.feature.support.artifact.ArtifactHandler;
+import org.apache.sling.feature.support.artifact.ArtifactManager;
+import org.apache.sling.feature.support.artifact.ArtifactManagerConfig;
import org.apache.sling.feature.support.json.ApplicationJSONWriter;
import org.apache.sling.feature.support.json.FeatureJSONWriter;
import org.apache.sling.feature.support.json.WriteOption;
diff --git a/featuremodel/feature-modelconverter/src/test/java/org/apache/sling/feature/modelconverter/impl/ModelConverterTest.java b/featuremodel/feature-modelconverter/src/test/java/org/apache/sling/feature/modelconverter/impl/ModelConverterTest.java
index 1b5f4aa..dfc85ee 100644
--- a/featuremodel/feature-modelconverter/src/test/java/org/apache/sling/feature/modelconverter/impl/ModelConverterTest.java
+++ b/featuremodel/feature-modelconverter/src/test/java/org/apache/sling/feature/modelconverter/impl/ModelConverterTest.java
@@ -21,9 +21,9 @@ import org.apache.sling.feature.Configurations;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Extensions;
-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.SubstituteVariables;
import org.apache.sling.provisioning.model.Artifact;
import org.apache.sling.provisioning.model.ArtifactGroup;
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 1081429..bd93d72 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
@@ -37,7 +37,7 @@ import org.apache.sling.feature.analyser.impl.BundleDescriptorImpl;
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.artifact.ArtifactManager;
import org.apache.sling.feature.support.resolver.FeatureResolver;
import org.apache.sling.feature.support.resolver.FeatureResource;
import org.osgi.framework.BundleContext;
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 47c7dc6..b1c30a2 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
@@ -29,9 +29,9 @@ import java.util.Comparator;
import java.util.Map;
import org.apache.sling.feature.Feature;
-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.artifact.ArtifactHandler;
+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;
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 b816b9a..fb90397 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
@@ -28,6 +28,8 @@ import java.util.List;
import org.apache.sling.feature.Application;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.support.artifact.ArtifactHandler;
+import org.apache.sling.feature.support.artifact.ArtifactManager;
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;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactHandler.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactHandler.java
similarity index 95%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactHandler.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactHandler.java
index 93f6bc9..b1f609f 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactHandler.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactHandler.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.support;
+package org.apache.sling.feature.support.artifact;
import java.io.File;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManager.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactManager.java
similarity index 98%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManager.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactManager.java
index 1568703..2b33f69 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManager.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactManager.java
@@ -14,11 +14,11 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.support;
+package org.apache.sling.feature.support.artifact;
import org.apache.sling.feature.ArtifactId;
-import org.apache.sling.feature.support.spi.ArtifactProvider;
-import org.apache.sling.feature.support.spi.ArtifactProviderContext;
+import org.apache.sling.feature.support.artifact.spi.ArtifactProvider;
+import org.apache.sling.feature.support.artifact.spi.ArtifactProviderContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactManagerConfig.java
similarity index 87%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactManagerConfig.java
index 7a1dfef..e3dbb02 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactManagerConfig.java
@@ -14,14 +14,14 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.support;
-
-import org.apache.sling.feature.support.spi.ArtifactProviderContext;
+package org.apache.sling.feature.support.artifact;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
+import org.apache.sling.feature.support.artifact.spi.ArtifactProviderContext;
+
/**
* This class holds the configuration of artifact manager.
*/
@@ -93,6 +93,10 @@ public class ArtifactManagerConfig implements ArtifactProviderContext {
return cacheDirectory;
}
+ /**
+ * Set the cache directory
+ * @param dir The cache directory
+ */
public void setCacheDirectory(final File dir) {
this.cacheDirectory = dir;
}
@@ -112,14 +116,26 @@ public class ArtifactManagerConfig implements ArtifactProviderContext {
this.localArtifacts++;
}
+ /**
+ * Get the number of cached artifacts
+ * @return The number of cached artifacts
+ */
public long getCachedArtifacts() {
return this.cachedArtifacts;
}
+ /**
+ * Get the number of downloaded artifacts
+ * @return The number of downloaded artifacts
+ */
public long getDownloadedArtifacts() {
return this.downloadedArtifacts;
}
+ /**
+ * Get the number of local artifacts
+ * @return The number of local artifacts
+ */
public long getLocalArtifacts() {
return this.localArtifacts;
}
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/spi/package-info.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/package-info.java
similarity index 94%
copy from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/spi/package-info.java
copy to featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/package-info.java
index da39f4a..0d86446 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/spi/package-info.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/package-info.java
@@ -18,6 +18,6 @@
*/
@org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.feature.support.spi;
+package org.apache.sling.feature.support.artifact;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/spi/ArtifactProvider.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/ArtifactProvider.java
similarity index 97%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/spi/ArtifactProvider.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/ArtifactProvider.java
index 0534182..e8183c8 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/spi/ArtifactProvider.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/ArtifactProvider.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.support.spi;
+package org.apache.sling.feature.support.artifact.spi;
import java.io.File;
import java.io.IOException;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/spi/ArtifactProviderContext.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/ArtifactProviderContext.java
similarity index 96%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/spi/ArtifactProviderContext.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/ArtifactProviderContext.java
index b6e11bc..628b13f 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/spi/ArtifactProviderContext.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/ArtifactProviderContext.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.support.spi;
+package org.apache.sling.feature.support.artifact.spi;
import java.io.File;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/spi/package-info.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/package-info.java
similarity index 93%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/spi/package-info.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/package-info.java
index da39f4a..586fe95 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/spi/package-info.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/package-info.java
@@ -18,6 +18,6 @@
*/
@org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.feature.support.spi;
+package org.apache.sling.feature.support.artifact.spi;
diff --git a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/ArtifactManagerTest.java b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/artifact/ArtifactManagerTest.java
similarity index 93%
rename from featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/ArtifactManagerTest.java
rename to featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/artifact/ArtifactManagerTest.java
index a6daf59..3c438d9 100644
--- a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/ArtifactManagerTest.java
+++ b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/artifact/ArtifactManagerTest.java
@@ -14,9 +14,12 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.support;
+package org.apache.sling.feature.support.artifact;
-import org.apache.sling.feature.support.spi.ArtifactProvider;
+import org.apache.sling.feature.support.artifact.ArtifactHandler;
+import org.apache.sling.feature.support.artifact.ArtifactManager;
+import org.apache.sling.feature.support.artifact.ArtifactManagerConfig;
+import org.apache.sling.feature.support.artifact.spi.ArtifactProvider;
import org.junit.Test;
import java.io.File;
--
To stop receiving notification emails like this one, please contact
cziegeler@apache.org.