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/18 08:26:52 UTC
[sling-whiteboard] branch master updated: Rename packages
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 e252909 Rename packages
e252909 is described below
commit e252909cfbabd748bd31d919e29f8d6c4a418a44
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Apr 18 10:26:45 2018 +0200
Rename packages
---
.../java/org/apache/sling/feature/analyser/main/Main.java | 4 ++--
.../org/apache/sling/feature/analyser/service/Scanner.java | 4 ++--
.../org/apache/sling/feature/scanner/ExtensionScanner.java | 2 +-
.../scanner/impl/ContentPackagesExtensionScanner.java | 2 +-
.../apache/sling/feature/scanner/impl/RepoInitScanner.java | 2 +-
.../java/org/apache/sling/feature/analyser/AnalyserTest.java | 8 ++++----
.../apache/sling/feature/applicationbuilder/impl/Main.java | 6 +++---
.../applicationbuilder/impl/ApplicationBuilderTest.java | 12 ++++++------
.../org/apache/sling/feature/karaf/KarafFeatureWriter.java | 4 ++--
.../apache/sling/feature/launcher/impl/FeatureProcessor.java | 10 +++++-----
.../apache/sling/feature/launcher/impl/LauncherConfig.java | 4 ++--
.../java/org/apache/sling/feature/launcher/impl/Main.java | 4 ++--
.../feature/modelconverter/impl/FeatureToProvisioning.java | 6 +++---
.../org/apache/sling/feature/modelconverter/impl/Main.java | 4 ++--
.../feature/modelconverter/impl/ProvisioningToFeature.java | 12 ++++++------
.../feature/modelconverter/impl/ModelConverterTest.java | 6 +++---
.../org/apache/sling/feature/resolver/FrameworkResolver.java | 2 +-
.../apache/sling/feature/resolver/FrameworkResolverTest.java | 10 +++++-----
.../feature/{support/artifact => io}/ArtifactHandler.java | 2 +-
.../feature/{support/artifact => io}/ArtifactManager.java | 6 +++---
.../{support/artifact => io}/ArtifactManagerConfig.java | 4 ++--
.../org/apache/sling/feature/{support => }/io/FileUtils.java | 2 +-
.../feature/{support => io}/json/ApplicationJSONReader.java | 2 +-
.../feature/{support => io}/json/ApplicationJSONWriter.java | 2 +-
.../{support => io}/json/ConfigurationJSONReader.java | 2 +-
.../{support => io}/json/ConfigurationJSONWriter.java | 2 +-
.../feature/{support => io}/json/FeatureJSONReader.java | 2 +-
.../feature/{support => io}/json/FeatureJSONWriter.java | 2 +-
.../sling/feature/{support => io}/json/JSONConstants.java | 2 +-
.../sling/feature/{support => io}/json/JSONReaderBase.java | 2 +-
.../sling/feature/{support => io}/json/JSONWriterBase.java | 2 +-
.../sling/feature/{support => io}/json/WriteOption.java | 2 +-
.../sling/feature/{support => io}/json/package-info.java | 2 +-
.../sling/feature/{support/artifact => io}/package-info.java | 2 +-
.../{support/artifact => io}/spi/ArtifactProvider.java | 2 +-
.../artifact => io}/spi/ArtifactProviderContext.java | 2 +-
.../feature/{support/artifact => io}/spi/package-info.java | 2 +-
.../org/apache/sling/feature/support/ConfigurationUtil.java | 2 +-
.../java/org/apache/sling/feature/support/FeatureUtil.java | 8 ++++----
.../{support/artifact => io}/ArtifactManagerTest.java | 10 +++++-----
.../sling/feature/{support => }/io/FeatureUtilTest.java | 3 ++-
.../feature/{support => io}/json/FeatureJSONReaderTest.java | 5 +++--
.../feature/{support => io}/json/FeatureJSONWriterTest.java | 6 ++++--
.../org/apache/sling/feature/{support => io}/json/U.java | 5 +++--
.../sling/feature/support/util/CapabilityMatcherTest.java | 2 +-
.../java/org/apache/sling/feature/maven/Preprocessor.java | 6 +++---
.../java/org/apache/sling/feature/maven/ProjectHelper.java | 6 +++---
.../org/apache/sling/feature/maven/mojos/AttachFeature.java | 2 +-
48 files changed, 103 insertions(+), 98 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 449aa53..24235ed 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,9 +19,9 @@ 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.io.ArtifactManagerConfig;
+import org.apache.sling.feature.io.json.ApplicationJSONReader;
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 465b73d..4282d48 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
@@ -36,10 +36,10 @@ import org.apache.sling.feature.analyser.FeatureDescriptor;
import org.apache.sling.feature.analyser.impl.ApplicationDescriptorImpl;
import org.apache.sling.feature.analyser.impl.BundleDescriptorImpl;
import org.apache.sling.feature.analyser.impl.FeatureDescriptorImpl;
+import org.apache.sling.feature.io.ArtifactManager;
+import org.apache.sling.feature.io.ArtifactManagerConfig;
import org.apache.sling.feature.scanner.ExtensionScanner;
import org.apache.sling.feature.scanner.FrameworkScanner;
-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 308c8e0..6ffdf36 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.artifact.ArtifactManager;
+import org.apache.sling.feature.io.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 70b81b2..59129df 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
@@ -24,9 +24,9 @@ import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.analyser.ContainerDescriptor;
+import org.apache.sling.feature.io.ArtifactManager;
import org.apache.sling.feature.scanner.ExtensionScanner;
import org.apache.sling.feature.support.SlingConstants;
-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 41dafd7..56a0891 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
@@ -21,9 +21,9 @@ import java.io.IOException;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.analyser.ContainerDescriptor;
+import org.apache.sling.feature.io.ArtifactManager;
import org.apache.sling.feature.scanner.ExtensionScanner;
import org.apache.sling.feature.support.SlingConstants;
-import org.apache.sling.feature.support.artifact.ArtifactManager;
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 f6a0cf0..b77aef9 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,11 +22,11 @@ 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.io.ArtifactManager;
+import org.apache.sling.feature.io.ArtifactManagerConfig;
+import org.apache.sling.feature.io.json.FeatureJSONReader;
+import org.apache.sling.feature.io.json.FeatureJSONReader.SubstituteVariables;
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;
import org.apache.sling.feature.support.resolver.FeatureResource;
import org.junit.Test;
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 2c38faa..58f8e44 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,11 +24,11 @@ import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.sling.feature.Application;
import org.apache.sling.feature.ArtifactId;
+import org.apache.sling.feature.io.ArtifactManager;
+import org.apache.sling.feature.io.ArtifactManagerConfig;
+import org.apache.sling.feature.io.json.ApplicationJSONWriter;
import org.apache.sling.feature.resolver.FrameworkResolver;
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;
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 524991c..9426520 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
@@ -42,14 +42,14 @@ import org.apache.sling.feature.Feature;
import org.apache.sling.feature.builder.ApplicationBuilder;
import org.apache.sling.feature.builder.BuilderContext;
import org.apache.sling.feature.builder.FeatureProvider;
+import org.apache.sling.feature.io.ArtifactHandler;
+import org.apache.sling.feature.io.ArtifactManager;
+import org.apache.sling.feature.io.ArtifactManagerConfig;
+import org.apache.sling.feature.io.json.ApplicationJSONWriter;
+import org.apache.sling.feature.io.json.FeatureJSONReader;
+import org.apache.sling.feature.io.json.FeatureJSONReader.SubstituteVariables;
import org.apache.sling.feature.resolver.FrameworkResolver;
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;
import org.apache.sling.feature.support.resolver.FeatureResolver;
import org.junit.After;
import org.junit.Before;
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 14f8000..d6e426e 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,10 +37,10 @@ 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.io.ArtifactHandler;
+import org.apache.sling.feature.io.ArtifactManager;
import org.apache.sling.feature.support.ConfigurationUtil;
import org.apache.sling.feature.support.SlingConstants;
-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 5741952..2f2d7b0 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
@@ -29,14 +29,14 @@ import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.Configuration;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
+import org.apache.sling.feature.io.ArtifactHandler;
+import org.apache.sling.feature.io.ArtifactManager;
+import org.apache.sling.feature.io.json.ApplicationJSONReader;
+import org.apache.sling.feature.io.json.ApplicationJSONWriter;
import org.apache.sling.feature.launcher.impl.LauncherConfig.StartupMode;
import org.apache.sling.feature.resolver.FrameworkResolver;
import org.apache.sling.feature.support.FeatureUtil;
import org.apache.sling.feature.support.SlingConstants;
-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;
public class FeatureProcessor {
@@ -65,7 +65,7 @@ public class FeatureProcessor {
} else {
try (FeatureResolver resolver = new FrameworkResolver(artifactManager, Collections.emptyMap())) {
app = FeatureUtil.assembleApplication(null, artifactManager, resolver,
- org.apache.sling.feature.support.io.FileUtils.getFeatureFiles(config.getHomeDirectory(), config.getFeatureFiles()).toArray(new String[0]));
+ org.apache.sling.feature.io.FileUtils.getFeatureFiles(config.getHomeDirectory(), config.getFeatureFiles()).toArray(new String[0]));
} catch (Exception ex) {
Main.LOG().error("Error while assembling application: {}", ex.getMessage(), ex);
System.exit(1);
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 9737ca9..1feb931 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.artifact.ArtifactManagerConfig;
-import org.apache.sling.feature.support.artifact.spi.ArtifactProviderContext;
+import org.apache.sling.feature.io.ArtifactManagerConfig;
+import org.apache.sling.feature.io.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 7a7f48d..6593319 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
@@ -33,11 +33,11 @@ import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.sling.feature.Application;
import org.apache.sling.feature.ArtifactId;
+import org.apache.sling.feature.io.ArtifactHandler;
+import org.apache.sling.feature.io.ArtifactManager;
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.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 fd1d268..e6ce8a8 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
@@ -40,11 +40,11 @@ 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.io.ArtifactManager;
+import org.apache.sling.feature.io.json.ApplicationJSONReader;
+import org.apache.sling.feature.io.json.FeatureJSONReader.SubstituteVariables;
import org.apache.sling.feature.support.FeatureUtil;
import org.apache.sling.feature.support.SlingConstants;
-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;
import org.apache.sling.provisioning.model.Artifact;
import org.apache.sling.provisioning.model.Configuration;
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 abf7bfb..a21791d 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.artifact.ArtifactManager;
-import org.apache.sling.feature.support.artifact.ArtifactManagerConfig;
+import org.apache.sling.feature.io.ArtifactManager;
+import org.apache.sling.feature.io.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 1be7c02..466e961 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
@@ -39,14 +39,14 @@ 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.io.ArtifactHandler;
+import org.apache.sling.feature.io.ArtifactManager;
+import org.apache.sling.feature.io.ArtifactManagerConfig;
+import org.apache.sling.feature.io.json.ApplicationJSONWriter;
+import org.apache.sling.feature.io.json.FeatureJSONWriter;
+import org.apache.sling.feature.io.json.WriteOption;
import org.apache.sling.feature.support.FeatureUtil;
import org.apache.sling.feature.support.SlingConstants;
-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;
import org.apache.sling.provisioning.model.Artifact;
import org.apache.sling.provisioning.model.ArtifactGroup;
import org.apache.sling.provisioning.model.Configuration;
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 86705da..4f17c1b 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
@@ -44,10 +44,10 @@ 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.io.ArtifactManager;
+import org.apache.sling.feature.io.ArtifactManagerConfig;
+import org.apache.sling.feature.io.json.FeatureJSONReader.SubstituteVariables;
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;
import org.apache.sling.provisioning.model.Configuration;
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 f0bf929..ba9d2af 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
@@ -34,10 +34,10 @@ import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.analyser.BundleDescriptor;
import org.apache.sling.feature.analyser.impl.BundleDescriptorImpl;
+import org.apache.sling.feature.io.ArtifactManager;
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.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 b1c30a2..8a8b63e 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,11 +29,11 @@ import java.util.Comparator;
import java.util.Map;
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.artifact.ArtifactManagerConfig;
-import org.apache.sling.feature.support.json.FeatureJSONReader;
-import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
+import org.apache.sling.feature.io.ArtifactHandler;
+import org.apache.sling.feature.io.ArtifactManager;
+import org.apache.sling.feature.io.ArtifactManagerConfig;
+import org.apache.sling.feature.io.json.FeatureJSONReader;
+import org.apache.sling.feature.io.json.FeatureJSONReader.SubstituteVariables;
import org.apache.sling.feature.support.resolver.FeatureResolver;
import org.apache.sling.feature.support.resolver.FeatureResource;
import org.junit.After;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactHandler.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/ArtifactHandler.java
similarity index 95%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactHandler.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/ArtifactHandler.java
index b1f609f..45f27be 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactHandler.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/ArtifactHandler.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.support.artifact;
+package org.apache.sling.feature.io;
import java.io.File;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactManager.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/ArtifactManager.java
similarity index 98%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactManager.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/ArtifactManager.java
index 2b33f69..954ac1a 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactManager.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/ArtifactManager.java
@@ -14,11 +14,11 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.support.artifact;
+package org.apache.sling.feature.io;
import org.apache.sling.feature.ArtifactId;
-import org.apache.sling.feature.support.artifact.spi.ArtifactProvider;
-import org.apache.sling.feature.support.artifact.spi.ArtifactProviderContext;
+import org.apache.sling.feature.io.spi.ArtifactProvider;
+import org.apache.sling.feature.io.spi.ArtifactProviderContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactManagerConfig.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/ArtifactManagerConfig.java
similarity index 96%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactManagerConfig.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/ArtifactManagerConfig.java
index e3dbb02..5df9ed8 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/ArtifactManagerConfig.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/ArtifactManagerConfig.java
@@ -14,13 +14,13 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.support.artifact;
+package org.apache.sling.feature.io;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
-import org.apache.sling.feature.support.artifact.spi.ArtifactProviderContext;
+import org.apache.sling.feature.io.spi.ArtifactProviderContext;
/**
* This class holds the configuration of artifact manager.
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/io/FileUtils.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/FileUtils.java
similarity index 99%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/io/FileUtils.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/FileUtils.java
index e3f23a1..a54d933 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/io/FileUtils.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/FileUtils.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.support.io;
+package org.apache.sling.feature.io;
import java.io.File;
import java.io.IOException;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/ApplicationJSONReader.java
similarity index 98%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/ApplicationJSONReader.java
index 677e848..88d3bc5 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/ApplicationJSONReader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.support.json;
+package org.apache.sling.feature.io.json;
import java.io.IOException;
import java.io.Reader;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONWriter.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/ApplicationJSONWriter.java
similarity index 98%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONWriter.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/ApplicationJSONWriter.java
index 32835ab..bdf4902 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONWriter.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/ApplicationJSONWriter.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.support.json;
+package org.apache.sling.feature.io.json;
import org.apache.sling.feature.Application;
import org.apache.sling.feature.ArtifactId;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONReader.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/ConfigurationJSONReader.java
similarity index 98%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONReader.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/ConfigurationJSONReader.java
index d10bafe..5fca482 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONReader.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/ConfigurationJSONReader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.support.json;
+package org.apache.sling.feature.io.json;
import org.apache.felix.configurator.impl.json.JSONUtil;
import org.apache.sling.feature.Configurations;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONWriter.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/ConfigurationJSONWriter.java
similarity index 97%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONWriter.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/ConfigurationJSONWriter.java
index 1024c51..64e937d 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONWriter.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/ConfigurationJSONWriter.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.support.json;
+package org.apache.sling.feature.io.json;
import org.apache.sling.feature.Configurations;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/FeatureJSONReader.java
similarity index 99%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/FeatureJSONReader.java
index 45f8532..13d7642 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/FeatureJSONReader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.support.json;
+package org.apache.sling.feature.io.json;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/FeatureJSONWriter.java
similarity index 99%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/FeatureJSONWriter.java
index 8cf5f5b..6cce2ba 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/FeatureJSONWriter.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.support.json;
+package org.apache.sling.feature.io.json;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Configuration;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONConstants.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/JSONConstants.java
similarity index 98%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONConstants.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/JSONConstants.java
index 7f34ef3..3b6f707 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONConstants.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/JSONConstants.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.support.json;
+package org.apache.sling.feature.io.json;
import org.apache.sling.feature.Configuration;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONReaderBase.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/JSONReaderBase.java
similarity index 99%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONReaderBase.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/JSONReaderBase.java
index 18d5c6a..fe3b89e 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONReaderBase.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/JSONReaderBase.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.support.json;
+package org.apache.sling.feature.io.json;
import org.apache.felix.configurator.impl.json.JSMin;
import org.apache.felix.configurator.impl.json.JSONUtil;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONWriterBase.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/JSONWriterBase.java
similarity index 99%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONWriterBase.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/JSONWriterBase.java
index 2dc1438..510b9c6 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONWriterBase.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/JSONWriterBase.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.support.json;
+package org.apache.sling.feature.io.json;
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.Bundles;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/WriteOption.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/WriteOption.java
similarity index 95%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/WriteOption.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/WriteOption.java
index 01f0158..b01b023 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/WriteOption.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/WriteOption.java
@@ -1,4 +1,4 @@
-package org.apache.sling.feature.support.json;
+package org.apache.sling.feature.io.json;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with this
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/package-info.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/package-info.java
similarity index 94%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/package-info.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/package-info.java
index 968df84..6b84931 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/json/package-info.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/json/package-info.java
@@ -18,6 +18,6 @@
*/
@org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.feature.support.json;
+package org.apache.sling.feature.io.json;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/package-info.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/package-info.java
similarity index 94%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/package-info.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/package-info.java
index 0d86446..25e2f46 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/package-info.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/package-info.java
@@ -18,6 +18,6 @@
*/
@org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.feature.support.artifact;
+package org.apache.sling.feature.io;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/ArtifactProvider.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/spi/ArtifactProvider.java
similarity index 97%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/ArtifactProvider.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/spi/ArtifactProvider.java
index e8183c8..5f250d7 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/ArtifactProvider.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/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.artifact.spi;
+package org.apache.sling.feature.io.spi;
import java.io.File;
import java.io.IOException;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/ArtifactProviderContext.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/spi/ArtifactProviderContext.java
similarity index 96%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/ArtifactProviderContext.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/spi/ArtifactProviderContext.java
index 628b13f..c837548 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/ArtifactProviderContext.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/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.artifact.spi;
+package org.apache.sling.feature.io.spi;
import java.io.File;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/package-info.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/spi/package-info.java
similarity index 93%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/package-info.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/spi/package-info.java
index 586fe95..b69692b 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/artifact/spi/package-info.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/io/spi/package-info.java
@@ -18,6 +18,6 @@
*/
@org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.feature.support.artifact.spi;
+package org.apache.sling.feature.io.spi;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java
index a8d941b..54a636a 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java
@@ -26,7 +26,7 @@ import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
import org.apache.sling.feature.Configurations;
-import org.apache.sling.feature.support.json.ConfigurationJSONWriter;
+import org.apache.sling.feature.io.json.ConfigurationJSONWriter;
import org.osgi.framework.Constants;
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 21dcc77..7c921a5 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
@@ -29,10 +29,10 @@ import org.apache.sling.feature.Feature;
import org.apache.sling.feature.builder.ApplicationBuilder;
import org.apache.sling.feature.builder.BuilderContext;
import org.apache.sling.feature.builder.FeatureProvider;
-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.io.ArtifactHandler;
+import org.apache.sling.feature.io.ArtifactManager;
+import org.apache.sling.feature.io.json.FeatureJSONReader;
+import org.apache.sling.feature.io.json.FeatureJSONReader.SubstituteVariables;
import org.apache.sling.feature.support.resolver.FeatureResolver;
import org.apache.sling.feature.support.resolver.FeatureResource;
diff --git a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/artifact/ArtifactManagerTest.java b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/io/ArtifactManagerTest.java
similarity index 93%
rename from featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/artifact/ArtifactManagerTest.java
rename to featuremodel/feature-support/src/test/java/org/apache/sling/feature/io/ArtifactManagerTest.java
index 3c438d9..f89c40b 100644
--- a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/artifact/ArtifactManagerTest.java
+++ b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/io/ArtifactManagerTest.java
@@ -14,12 +14,12 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.support.artifact;
+package org.apache.sling.feature.io;
-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.apache.sling.feature.io.ArtifactHandler;
+import org.apache.sling.feature.io.ArtifactManager;
+import org.apache.sling.feature.io.ArtifactManagerConfig;
+import org.apache.sling.feature.io.spi.ArtifactProvider;
import org.junit.Test;
import java.io.File;
diff --git a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/io/FeatureUtilTest.java b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/io/FeatureUtilTest.java
similarity index 95%
rename from featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/io/FeatureUtilTest.java
rename to featuremodel/feature-support/src/test/java/org/apache/sling/feature/io/FeatureUtilTest.java
index cbc78e7..e06b175 100644
--- a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/io/FeatureUtilTest.java
+++ b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/io/FeatureUtilTest.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.support.io;
+package org.apache.sling.feature.io;
import static org.junit.Assert.assertEquals;
@@ -23,6 +23,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import org.apache.sling.feature.io.FileUtils;
import org.junit.Test;
public class FeatureUtilTest {
diff --git a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONReaderTest.java b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/io/json/FeatureJSONReaderTest.java
similarity index 98%
rename from featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONReaderTest.java
rename to featuremodel/feature-support/src/test/java/org/apache/sling/feature/io/json/FeatureJSONReaderTest.java
index 2bcaa1c..47ab83b 100644
--- a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONReaderTest.java
+++ b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/io/json/FeatureJSONReaderTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.support.json;
+package org.apache.sling.feature.io.json;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Bundles;
@@ -25,7 +25,8 @@ import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.Include;
import org.apache.sling.feature.KeyValueMap;
-import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
+import org.apache.sling.feature.io.json.FeatureJSONReader;
+import org.apache.sling.feature.io.json.FeatureJSONReader.SubstituteVariables;
import org.junit.Test;
import org.osgi.resource.Capability;
import org.osgi.resource.Requirement;
diff --git a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONWriterTest.java b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/io/json/FeatureJSONWriterTest.java
similarity index 88%
rename from featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONWriterTest.java
rename to featuremodel/feature-support/src/test/java/org/apache/sling/feature/io/json/FeatureJSONWriterTest.java
index 37db933..81db5e6 100644
--- a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONWriterTest.java
+++ b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/io/json/FeatureJSONWriterTest.java
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.support.json;
+package org.apache.sling.feature.io.json;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
+import org.apache.sling.feature.io.json.FeatureJSONReader;
+import org.apache.sling.feature.io.json.FeatureJSONWriter;
+import org.apache.sling.feature.io.json.FeatureJSONReader.SubstituteVariables;
import org.junit.Test;
import java.io.StringReader;
diff --git a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/json/U.java b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/io/json/U.java
similarity index 94%
rename from featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/json/U.java
rename to featuremodel/feature-support/src/test/java/org/apache/sling/feature/io/json/U.java
index 1eaf415..904f158 100644
--- a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/json/U.java
+++ b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/io/json/U.java
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.support.json;
+package org.apache.sling.feature.io.json;
import org.apache.sling.feature.Configuration;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
+import org.apache.sling.feature.io.json.FeatureJSONReader;
+import org.apache.sling.feature.io.json.FeatureJSONReader.SubstituteVariables;
import org.osgi.resource.Capability;
import org.osgi.resource.Requirement;
diff --git a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/util/CapabilityMatcherTest.java b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/util/CapabilityMatcherTest.java
index 99567eb..048e6e2 100644
--- a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/util/CapabilityMatcherTest.java
+++ b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/util/CapabilityMatcherTest.java
@@ -19,7 +19,7 @@ package org.apache.sling.feature.support.util;
import static junit.framework.TestCase.assertTrue;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.support.json.U;
+import org.apache.sling.feature.io.json.U;
import org.junit.Test;
import org.osgi.resource.Requirement;
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 a2665f8..2b50c2b 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
@@ -35,8 +35,8 @@ import org.apache.sling.feature.Feature;
import org.apache.sling.feature.builder.BuilderContext;
import org.apache.sling.feature.builder.FeatureBuilder;
import org.apache.sling.feature.builder.FeatureProvider;
-import org.apache.sling.feature.support.json.FeatureJSONReader;
-import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
+import org.apache.sling.feature.io.json.FeatureJSONReader;
+import org.apache.sling.feature.io.json.FeatureJSONReader.SubstituteVariables;
import org.codehaus.plexus.logging.Logger;
/**
@@ -235,7 +235,7 @@ public class Preprocessor {
for(final File file : files) {
try {
- final List<String> features = org.apache.sling.feature.support.io.FileUtils.parseFeatureRefFile(file);
+ final List<String> features = org.apache.sling.feature.io.FileUtils.parseFeatureRefFile(file);
if ( features.isEmpty() ) {
env.logger.debug("Empty feature ref file at " + file);
} else {
diff --git a/featuremodel/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java b/featuremodel/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
index ce3314c..c4d1071 100644
--- a/featuremodel/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
+++ b/featuremodel/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
@@ -30,9 +30,9 @@ import org.apache.maven.model.PluginExecution;
import org.apache.maven.project.MavenProject;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.support.json.FeatureJSONReader;
-import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
-import org.apache.sling.feature.support.json.FeatureJSONWriter;
+import org.apache.sling.feature.io.json.FeatureJSONReader;
+import org.apache.sling.feature.io.json.FeatureJSONWriter;
+import org.apache.sling.feature.io.json.FeatureJSONReader.SubstituteVariables;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.io.IOException;
diff --git a/featuremodel/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java b/featuremodel/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java
index 79c5c23..2cf38ff 100644
--- a/featuremodel/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java
+++ b/featuremodel/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java
@@ -22,9 +22,9 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.io.json.FeatureJSONWriter;
import org.apache.sling.feature.maven.FeatureConstants;
import org.apache.sling.feature.maven.ProjectHelper;
-import org.apache.sling.feature.support.json.FeatureJSONWriter;
import java.io.File;
import java.io.FileWriter;
--
To stop receiving notification emails like this one, please contact
cziegeler@apache.org.