Author: pauls
Date: Mon Jul 31 22:01:42 2017
New Revision: 1803583
URL: http://svn.apache.org/viewvc?rev=1803583&view=rev
Log:
Optimize imports
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/ArtifactDescriptor.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Descriptor.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Scanner.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/BundleDescriptorImpl.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundleExportsImports.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForInitialContent.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForResources.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ContainerDescriptorImpl.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/resolver/Resolver.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/resolver/ResolverContext.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactScanner.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FrameworkScanner.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
sling/whiteboard/cziegeler/feature-karaf/src/main/java/org/apache/sling/feature/karaf/KarafFeatureWriter.java
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Installation.java
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/LauncherConfig.java
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/AbstractRunner.java
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkRunner.java
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/spi/LauncherPrepareContext.java
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManager.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONWriter.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONReader.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONWriter.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONConstants.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONReaderBase.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONWriterBase.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestParser.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/ArtifactManagerTest.java
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/FeatureUtilTest.java
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONReaderTest.java
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONWriterTest.java
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/U.java
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Capability.java
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderUtil.java
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/FeatureBuilder.java
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/ArtifactIdTest.java
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/BundlesTest.java
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/process/BuilderUtilTest.java
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/process/FeatureBuilderTest.java
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ApplicationProjectInfo.java
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Environment.java
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java
Mon Jul 31 22:01:42 2017
@@ -16,6 +16,12 @@
*/
package org.apache.sling.feature.analyser;
+import org.apache.sling.feature.Application;
+import org.apache.sling.feature.analyser.task.AnalyserTask;
+import org.apache.sling.feature.analyser.task.AnalyserTaskContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -24,12 +30,6 @@ import java.util.List;
import java.util.ServiceLoader;
import java.util.Set;
-import org.apache.sling.feature.Application;
-import org.apache.sling.feature.analyser.task.AnalyserTask;
-import org.apache.sling.feature.analyser.task.AnalyserTaskContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class Analyser {
private final AnalyserTask[] tasks;
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/ArtifactDescriptor.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/ArtifactDescriptor.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/ArtifactDescriptor.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/ArtifactDescriptor.java
Mon Jul 31 22:01:42 2017
@@ -16,11 +16,11 @@
*/
package org.apache.sling.feature.analyser;
+import org.apache.sling.feature.Artifact;
+
import java.io.File;
import java.util.jar.Manifest;
-import org.apache.sling.feature.Artifact;
-
/**
* Information about an artifact
*/
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Descriptor.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Descriptor.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Descriptor.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Descriptor.java
Mon Jul 31 22:01:42 2017
@@ -16,13 +16,13 @@
*/
package org.apache.sling.feature.analyser;
-import java.util.Collections;
-import java.util.Set;
-
import org.apache.sling.feature.Capability;
import org.apache.sling.feature.Requirement;
import org.apache.sling.feature.support.util.PackageInfo;
+import java.util.Collections;
+import java.util.Set;
+
/**
* A descriptor holds information about requirements and capabilities
*/
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Scanner.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Scanner.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Scanner.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Scanner.java
Mon Jul 31 22:01:42 2017
@@ -16,13 +16,6 @@
*/
package org.apache.sling.feature.analyser;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.ServiceLoader;
-
import org.apache.sling.feature.Application;
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.Bundles;
@@ -40,6 +33,13 @@ import org.apache.sling.feature.scanner.
import org.apache.sling.feature.support.ArtifactManager;
import org.apache.sling.feature.support.ArtifactManagerConfig;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.ServiceLoader;
+
/**
* The scanner is a service that scans items and provides descriptions for
these.
* The following items can be scanned individually
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/BundleDescriptorImpl.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/BundleDescriptorImpl.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/BundleDescriptorImpl.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/BundleDescriptorImpl.java
Mon Jul 31 22:01:42 2017
@@ -16,22 +16,22 @@
*/
package org.apache.sling.feature.analyser.impl;
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.jar.Manifest;
-
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.Capability;
import org.apache.sling.feature.Requirement;
import org.apache.sling.feature.analyser.BundleDescriptor;
-import org.apache.sling.feature.support.util.PackageInfo;
import org.apache.sling.feature.support.util.ManifestParser;
import org.apache.sling.feature.support.util.ManifestUtil;
+import org.apache.sling.feature.support.util.PackageInfo;
import org.osgi.framework.Constants;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.jar.Manifest;
+
/**
* Information about a bundle
*/
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundleExportsImports.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundleExportsImports.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundleExportsImports.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundleExportsImports.java
Mon Jul 31 22:01:42 2017
@@ -18,6 +18,13 @@
*/
package org.apache.sling.feature.analyser.impl;
+import org.apache.sling.feature.Artifact;
+import org.apache.sling.feature.analyser.BundleDescriptor;
+import org.apache.sling.feature.analyser.task.AnalyserTask;
+import org.apache.sling.feature.analyser.task.AnalyserTaskContext;
+import org.apache.sling.feature.support.util.PackageInfo;
+import org.osgi.framework.Version;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -26,13 +33,6 @@ import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
-import org.apache.sling.feature.Artifact;
-import org.apache.sling.feature.analyser.BundleDescriptor;
-import org.apache.sling.feature.support.util.PackageInfo;
-import org.apache.sling.feature.analyser.task.AnalyserTask;
-import org.apache.sling.feature.analyser.task.AnalyserTaskContext;
-import org.osgi.framework.Version;
-
public class CheckBundleExportsImports implements AnalyserTask {
@Override
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForInitialContent.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForInitialContent.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForInitialContent.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForInitialContent.java
Mon Jul 31 22:01:42 2017
@@ -18,15 +18,15 @@
*/
package org.apache.sling.feature.analyser.impl;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.jar.Manifest;
-
import org.apache.sling.commons.osgi.ManifestHeader;
import org.apache.sling.feature.analyser.BundleDescriptor;
import org.apache.sling.feature.analyser.task.AnalyserTask;
import org.apache.sling.feature.analyser.task.AnalyserTaskContext;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.jar.Manifest;
+
public class CheckBundlesForInitialContent implements AnalyserTask {
/** The manifest header to specify initial content to be loaded. */
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForResources.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForResources.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForResources.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForResources.java
Mon Jul 31 22:01:42 2017
@@ -18,15 +18,15 @@
*/
package org.apache.sling.feature.analyser.impl;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.jar.Manifest;
-
import org.apache.sling.commons.osgi.ManifestHeader;
import org.apache.sling.feature.analyser.BundleDescriptor;
import org.apache.sling.feature.analyser.task.AnalyserTask;
import org.apache.sling.feature.analyser.task.AnalyserTaskContext;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.jar.Manifest;
+
public class CheckBundlesForResources implements AnalyserTask {
/** The manifest header to specify bundle resources. */
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java
Mon Jul 31 22:01:42 2017
@@ -24,9 +24,13 @@ import org.apache.sling.feature.analyser
import org.apache.sling.feature.analyser.task.AnalyserTask;
import org.apache.sling.feature.analyser.task.AnalyserTaskContext;
import org.apache.sling.feature.support.impl.CapabilityMatcher;
-import org.osgi.framework.Constants;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
import java.util.stream.Collectors;
public class CheckRequirementsCapabilities implements AnalyserTask {
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ContainerDescriptorImpl.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ContainerDescriptorImpl.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ContainerDescriptorImpl.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ContainerDescriptorImpl.java
Mon Jul 31 22:01:42 2017
@@ -16,9 +16,6 @@
*/
package org.apache.sling.feature.analyser.impl;
-import java.util.HashSet;
-import java.util.Set;
-
import org.apache.sling.feature.Capability;
import org.apache.sling.feature.Requirement;
import org.apache.sling.feature.analyser.ArtifactDescriptor;
@@ -26,6 +23,9 @@ import org.apache.sling.feature.analyser
import org.apache.sling.feature.analyser.ContainerDescriptor;
import org.apache.sling.feature.support.util.PackageInfo;
+import java.util.HashSet;
+import java.util.Set;
+
/**
* Information about a container (feature/application).
* This is the aggregated information.
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java
Mon Jul 31 22:01:42 2017
@@ -16,19 +16,19 @@
*/
package org.apache.sling.feature.analyser.main;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-
import org.apache.sling.feature.Application;
import org.apache.sling.feature.analyser.Analyser;
import org.apache.sling.feature.analyser.Scanner;
-import org.apache.sling.feature.support.json.ApplicationJSONReader;
import org.apache.sling.feature.support.ArtifactManagerConfig;
import org.apache.sling.feature.support.FeatureUtil;
+import org.apache.sling.feature.support.json.ApplicationJSONReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
public class Main {
public static void main(final String[] args) {
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/resolver/Resolver.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/resolver/Resolver.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/resolver/Resolver.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/resolver/Resolver.java
Mon Jul 31 22:01:42 2017
@@ -16,11 +16,11 @@
*/
package org.apache.sling.feature.resolver;
+import org.apache.sling.feature.Feature;
+
import java.util.ArrayList;
import java.util.List;
-import org.apache.sling.feature.Feature;
-
public class Resolver {
public List<Feature> resolve(final ResolverContext ctx) {
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/resolver/ResolverContext.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/resolver/ResolverContext.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/resolver/ResolverContext.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/resolver/ResolverContext.java
Mon Jul 31 22:01:42 2017
@@ -16,11 +16,11 @@
*/
package org.apache.sling.feature.resolver;
+import org.apache.sling.feature.Feature;
+
import java.util.ArrayList;
import java.util.List;
-import org.apache.sling.feature.Feature;
-
public class ResolverContext {
private final List<Feature> requiredFeatures = new ArrayList<>();
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactScanner.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactScanner.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactScanner.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactScanner.java
Mon Jul 31 22:01:42 2017
@@ -16,12 +16,12 @@
*/
package org.apache.sling.feature.scanner;
-import java.io.File;
-import java.io.IOException;
-
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.analyser.ArtifactDescriptor;
+import java.io.File;
+import java.io.IOException;
+
/**
* The artifact scanner scans an artifact.
*/
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java
Mon Jul 31 22:01:42 2017
@@ -16,14 +16,14 @@
*/
package org.apache.sling.feature.scanner;
-import java.io.IOException;
-import java.util.List;
-
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.analyser.ArtifactDescriptor;
import org.apache.sling.feature.analyser.Descriptor;
import org.apache.sling.feature.support.ArtifactManager;
+import java.io.IOException;
+import java.util.List;
+
/**
* The extension scanner scans an extension.
*/
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FrameworkScanner.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FrameworkScanner.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FrameworkScanner.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FrameworkScanner.java
Mon Jul 31 22:01:42 2017
@@ -16,13 +16,13 @@
*/
package org.apache.sling.feature.scanner;
-import java.io.File;
-import java.io.IOException;
-
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.KeyValueMap;
import org.apache.sling.feature.analyser.Descriptor;
+import java.io.File;
+import java.io.IOException;
+
/**
* The framework scanner scans the framework
*/
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
Mon Jul 31 22:01:42 2017
@@ -16,6 +16,14 @@
*/
package org.apache.sling.feature.scanner.impl;
+import org.apache.sling.commons.osgi.ManifestHeader;
+import org.apache.sling.feature.ArtifactId;
+import org.apache.sling.feature.KeyValueMap;
+import org.apache.sling.feature.analyser.Descriptor;
+import org.apache.sling.feature.scanner.FrameworkScanner;
+import org.apache.sling.feature.support.util.PackageInfo;
+import org.osgi.framework.Constants;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -27,14 +35,6 @@ import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import org.apache.sling.commons.osgi.ManifestHeader;
-import org.apache.sling.feature.ArtifactId;
-import org.apache.sling.feature.KeyValueMap;
-import org.apache.sling.feature.analyser.Descriptor;
-import org.apache.sling.feature.support.util.PackageInfo;
-import org.apache.sling.feature.scanner.FrameworkScanner;
-import org.osgi.framework.Constants;
-
public class FelixFrameworkScanner implements FrameworkScanner {
Modified:
sling/whiteboard/cziegeler/feature-karaf/src/main/java/org/apache/sling/feature/karaf/KarafFeatureWriter.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-karaf/src/main/java/org/apache/sling/feature/karaf/KarafFeatureWriter.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-karaf/src/main/java/org/apache/sling/feature/karaf/KarafFeatureWriter.java
(original)
+++
sling/whiteboard/cziegeler/feature-karaf/src/main/java/org/apache/sling/feature/karaf/KarafFeatureWriter.java
Mon Jul 31 22:01:42 2017
@@ -16,6 +16,16 @@
*/
package org.apache.sling.feature.karaf;
+import org.apache.sling.feature.Artifact;
+import org.apache.sling.feature.ArtifactId;
+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 java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -31,16 +41,6 @@ import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import org.apache.sling.feature.Artifact;
-import org.apache.sling.feature.ArtifactId;
-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;
-
/**
* This writer writes out a Karaf feature XML.
Modified:
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
(original)
+++
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
Mon Jul 31 22:01:42 2017
@@ -16,24 +16,24 @@
*/
package org.apache.sling.feature.launcher.impl;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
import org.apache.sling.feature.Application;
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.support.json.ApplicationJSONReader;
-import org.apache.sling.feature.support.json.ApplicationJSONWriter;
import org.apache.sling.feature.launcher.impl.LauncherConfig.StartupMode;
import org.apache.sling.feature.support.ArtifactHandler;
import org.apache.sling.feature.support.ArtifactManager;
import org.apache.sling.feature.support.FeatureUtil;
+import org.apache.sling.feature.support.json.ApplicationJSONReader;
+import org.apache.sling.feature.support.json.ApplicationJSONWriter;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
public class FeatureProcessor {
Modified:
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Installation.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Installation.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Installation.java
(original)
+++
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Installation.java
Mon Jul 31 22:01:42 2017
@@ -16,6 +16,8 @@
*/
package org.apache.sling.feature.launcher.impl;
+import org.apache.sling.feature.launcher.spi.LauncherRunContext;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Dictionary;
@@ -23,8 +25,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.sling.feature.launcher.spi.LauncherRunContext;
-
/**
* This class holds the configuration of the launcher.
*/
Modified:
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/LauncherConfig.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/LauncherConfig.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/LauncherConfig.java
(original)
+++
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/LauncherConfig.java
Mon Jul 31 22:01:42 2017
@@ -16,12 +16,12 @@
*/
package org.apache.sling.feature.launcher.impl;
-import java.io.File;
-import java.io.IOException;
-
import org.apache.sling.feature.support.ArtifactManagerConfig;
import org.apache.sling.feature.support.spi.ArtifactProviderContext;
+import java.io.File;
+import java.io.IOException;
+
/**
* This class holds the configuration of the launcher.
*/
Modified:
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
(original)
+++
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
Mon Jul 31 22:01:42 2017
@@ -16,15 +16,6 @@
*/
package org.apache.sling.feature.launcher.impl;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
import org.apache.commons.cli.BasicParser;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
@@ -41,6 +32,15 @@ import org.apache.sling.feature.support.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
/**
* This is the launcher main class.
* It parses command line parameters and prepares the launcher.
Modified:
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/AbstractRunner.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/AbstractRunner.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/AbstractRunner.java
(original)
+++
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/AbstractRunner.java
Mon Jul 31 22:01:42 2017
@@ -16,6 +16,18 @@
*/
package org.apache.sling.feature.launcher.impl.launchers;
+import org.apache.sling.feature.launcher.impl.Main;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.launch.Framework;
+import org.osgi.framework.startlevel.BundleStartLevel;
+import org.osgi.framework.wiring.FrameworkWiring;
+import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -31,18 +43,6 @@ import java.util.Hashtable;
import java.util.List;
import java.util.Map;
-import org.apache.sling.feature.launcher.impl.Main;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.launch.Framework;
-import org.osgi.framework.startlevel.BundleStartLevel;
-import org.osgi.framework.wiring.FrameworkWiring;
-import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
-
/**
* Common functionality for the framework start.
*/
Modified:
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java
(original)
+++
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java
Mon Jul 31 22:01:42 2017
@@ -16,15 +16,15 @@
*/
package org.apache.sling.feature.launcher.impl.launchers;
-import java.lang.reflect.Constructor;
-import java.util.List;
-import java.util.Map;
-
import org.apache.sling.feature.Application;
import org.apache.sling.feature.launcher.spi.Launcher;
import org.apache.sling.feature.launcher.spi.LauncherPrepareContext;
import org.apache.sling.feature.launcher.spi.LauncherRunContext;
+import java.lang.reflect.Constructor;
+import java.util.List;
+import java.util.Map;
+
/**
* Launcher directly using the OSGi launcher API.
*/
Modified:
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkRunner.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkRunner.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkRunner.java
(original)
+++
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkRunner.java
Mon Jul 31 22:01:42 2017
@@ -16,15 +16,15 @@
*/
package org.apache.sling.feature.launcher.impl.launchers;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.launch.Framework;
+import org.osgi.framework.launch.FrameworkFactory;
+
import java.io.File;
import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.launch.Framework;
-import org.osgi.framework.launch.FrameworkFactory;
-
/**
* Launcher directly using the OSGi launcher API.
*/
Modified:
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/spi/LauncherPrepareContext.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/spi/LauncherPrepareContext.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/spi/LauncherPrepareContext.java
(original)
+++
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/spi/LauncherPrepareContext.java
Mon Jul 31 22:01:42 2017
@@ -16,11 +16,11 @@
*/
package org.apache.sling.feature.launcher.spi;
+import org.apache.sling.feature.ArtifactId;
+
import java.io.File;
import java.io.IOException;
-import org.apache.sling.feature.ArtifactId;
-
/**
* This is the context for the launcher
*/
Modified:
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
(original)
+++
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
Mon Jul 31 22:01:42 2017
@@ -16,19 +16,6 @@
*/
package org.apache.sling.feature.modelconverter.impl;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.commons.cli.BasicParser;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
@@ -43,11 +30,11 @@ import org.apache.sling.feature.Extensio
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.KeyValueMap;
-import org.apache.sling.feature.support.json.ApplicationJSONWriter;
-import org.apache.sling.feature.support.json.FeatureJSONWriter;
import org.apache.sling.feature.support.ArtifactHandler;
import org.apache.sling.feature.support.ArtifactManager;
import org.apache.sling.feature.support.ArtifactManagerConfig;
+import org.apache.sling.feature.support.json.ApplicationJSONWriter;
+import org.apache.sling.feature.support.json.FeatureJSONWriter;
import org.apache.sling.provisioning.model.Artifact;
import org.apache.sling.provisioning.model.ArtifactGroup;
import org.apache.sling.provisioning.model.Configuration;
@@ -65,6 +52,19 @@ import org.osgi.framework.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
public class Main {
private static Logger LOGGER;
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManager.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManager.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManager.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManager.java
Mon Jul 31 22:01:42 2017
@@ -16,6 +16,12 @@
*/
package org.apache.sling.feature.support;
+import org.apache.sling.feature.ArtifactId;
+import org.apache.sling.feature.support.spi.ArtifactProvider;
+import org.apache.sling.feature.support.spi.ArtifactProviderContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -30,12 +36,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.ServiceLoader;
-import org.apache.sling.feature.ArtifactId;
-import org.apache.sling.feature.support.spi.ArtifactProvider;
-import org.apache.sling.feature.support.spi.ArtifactProviderContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* The artifact manager is the central service to get artifacts.
* It uses {@link ArtifactProvider}s to get artifacts. The
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java
Mon Jul 31 22:01:42 2017
@@ -16,12 +16,12 @@
*/
package org.apache.sling.feature.support;
+import org.apache.sling.feature.support.spi.ArtifactProviderContext;
+
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
-import org.apache.sling.feature.support.spi.ArtifactProviderContext;
-
/**
* This class holds the configuration of artifact manager.
*/
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java
Mon Jul 31 22:01:42 2017
@@ -16,6 +16,10 @@
*/
package org.apache.sling.feature.support;
+import org.apache.sling.feature.Configurations;
+import org.apache.sling.feature.support.json.ConfigurationJSONWriter;
+import org.osgi.framework.Constants;
+
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
@@ -25,10 +29,6 @@ import java.util.jar.JarOutputStream;
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.osgi.framework.Constants;
-
public class ConfigurationUtil {
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
Mon Jul 31 22:01:42 2017
@@ -16,6 +16,13 @@
*/
package org.apache.sling.feature.support;
+import org.apache.sling.feature.Application;
+import org.apache.sling.feature.ArtifactId;
+import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.process.ApplicationBuilder;
+import org.apache.sling.feature.process.FeatureProvider;
+import org.apache.sling.feature.support.json.FeatureJSONReader;
+
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
@@ -25,13 +32,6 @@ import java.util.Collections;
import java.util.Comparator;
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.json.FeatureJSONReader;
-import org.apache.sling.feature.process.ApplicationBuilder;
-import org.apache.sling.feature.process.FeatureProvider;
-
public class FeatureUtil {
/**
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java
Mon Jul 31 22:01:42 2017
@@ -1,5 +1,10 @@
package org.apache.sling.feature.support.impl;
+import org.apache.sling.feature.Capability;
+import org.apache.sling.feature.Requirement;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Version;
+
import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
@@ -14,11 +19,6 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.sling.feature.Capability;
-import org.apache.sling.feature.Requirement;
-import org.osgi.framework.Constants;
-import org.osgi.framework.Version;
-
import static org.osgi.framework.Constants.RESOLUTION_DIRECTIVE;
import static org.osgi.framework.Constants.RESOLUTION_OPTIONAL;
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java
Mon Jul 31 22:01:42 2017
@@ -16,17 +16,16 @@
*/
package org.apache.sling.feature.support.json;
+import org.apache.felix.configurator.impl.json.JSONUtil;
+import org.apache.sling.feature.Application;
+
+import javax.json.Json;
+import javax.json.JsonObject;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.util.Map;
-import javax.json.Json;
-import javax.json.JsonObject;
-
-import org.apache.felix.configurator.impl.json.JSONUtil;
-import org.apache.sling.feature.Application;
-
/**
* This class offers a method to read an {@code Application} using a {@code
Reader} instance.
*/
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONWriter.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONWriter.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONWriter.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONWriter.java
Mon Jul 31 22:01:42 2017
@@ -16,17 +16,16 @@
*/
package org.apache.sling.feature.support.json;
-import java.io.IOException;
-import java.io.Writer;
-
-import javax.json.Json;
-import javax.json.stream.JsonGenerator;
-
import org.apache.sling.feature.Application;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Configuration;
import org.apache.sling.feature.Configurations;
+import javax.json.Json;
+import javax.json.stream.JsonGenerator;
+import java.io.IOException;
+import java.io.Writer;
+
/**
* Simple JSON writer for an application
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONReader.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONReader.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONReader.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONReader.java
Mon Jul 31 22:01:42 2017
@@ -16,18 +16,17 @@
*/
package org.apache.sling.feature.support.json;
+import org.apache.felix.configurator.impl.json.JSONUtil;
+import org.apache.sling.feature.Configurations;
+
+import javax.json.Json;
+import javax.json.JsonObject;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.util.Collections;
import java.util.Map;
-import javax.json.Json;
-import javax.json.JsonObject;
-
-import org.apache.felix.configurator.impl.json.JSONUtil;
-import org.apache.sling.feature.Configurations;
-
/**
* JSON Reader for configurations.
*/
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONWriter.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONWriter.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONWriter.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONWriter.java
Mon Jul 31 22:01:42 2017
@@ -16,13 +16,12 @@
*/
package org.apache.sling.feature.support.json;
-import java.io.IOException;
-import java.io.Writer;
+import org.apache.sling.feature.Configurations;
import javax.json.Json;
import javax.json.stream.JsonGenerator;
-
-import org.apache.sling.feature.Configurations;
+import java.io.IOException;
+import java.io.Writer;
/**
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java
Mon Jul 31 22:01:42 2017
@@ -16,24 +16,21 @@
*/
package org.apache.sling.feature.support.json;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.json.Json;
-import javax.json.JsonObject;
-
import org.apache.felix.configurator.impl.json.JSONUtil;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Capability;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.Include;
import org.apache.sling.feature.Requirement;
-import org.apache.sling.feature.support.util.LambdaUtil;
-import org.apache.sling.feature.support.util.ManifestUtil;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import static
org.apache.sling.feature.support.util.LambdaUtil.rethrowBiConsumer;
import static
org.apache.sling.feature.support.util.ManifestUtil.unmarshalAttribute;
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java
Mon Jul 31 22:01:42 2017
@@ -16,15 +16,6 @@
*/
package org.apache.sling.feature.support.json;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiFunction;
-
-import javax.json.Json;
-import javax.json.stream.JsonGenerator;
-
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Capability;
import org.apache.sling.feature.Configuration;
@@ -32,7 +23,13 @@ import org.apache.sling.feature.Configur
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.Include;
import org.apache.sling.feature.Requirement;
-import org.apache.sling.feature.support.util.ManifestUtil;
+
+import javax.json.Json;
+import javax.json.stream.JsonGenerator;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.List;
+import java.util.Map;
import static
org.apache.sling.feature.support.util.ManifestUtil.marshalAttribute;
import static
org.apache.sling.feature.support.util.ManifestUtil.marshalDirective;
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONConstants.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONConstants.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONConstants.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONConstants.java
Mon Jul 31 22:01:42 2017
@@ -16,11 +16,11 @@
*/
package org.apache.sling.feature.support.json;
+import org.apache.sling.feature.Configuration;
+
import java.util.Arrays;
import java.util.List;
-import org.apache.sling.feature.Configuration;
-
public abstract class JSONConstants {
public static final String FEATURE_ID = "id";
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONReaderBase.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONReaderBase.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONReaderBase.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONReaderBase.java
Mon Jul 31 22:01:42 2017
@@ -16,24 +16,6 @@
*/
package org.apache.sling.feature.support.json;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonStructure;
-import javax.json.JsonWriter;
-
import org.apache.felix.configurator.impl.json.JSMin;
import org.apache.felix.configurator.impl.json.JSONUtil;
import org.apache.felix.configurator.impl.json.TypeConverter;
@@ -48,6 +30,23 @@ import org.apache.sling.feature.Extensio
import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.KeyValueMap;
+import javax.json.Json;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonObjectBuilder;
+import javax.json.JsonStructure;
+import javax.json.JsonWriter;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
/**
* Common methods for JSON reading.
*/
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONWriterBase.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONWriterBase.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONWriterBase.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONWriterBase.java
Mon Jul 31 22:01:42 2017
@@ -16,16 +16,6 @@
*/
package org.apache.sling.feature.support.json;
-import java.io.StringReader;
-import java.lang.reflect.Array;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-
-import javax.json.Json;
-import javax.json.JsonStructure;
-import javax.json.stream.JsonGenerator;
-
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.Bundles;
import org.apache.sling.feature.Configuration;
@@ -34,6 +24,15 @@ import org.apache.sling.feature.Extensio
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.KeyValueMap;
+import javax.json.Json;
+import javax.json.JsonStructure;
+import javax.json.stream.JsonGenerator;
+import java.io.StringReader;
+import java.lang.reflect.Array;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+
/**
* Common functionality for writing JSON
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestParser.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestParser.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestParser.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestParser.java
Mon Jul 31 22:01:42 2017
@@ -16,15 +16,6 @@
*/
package org.apache.sling.feature.support.util;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.jar.Manifest;
-
import org.apache.sling.feature.Capability;
import org.apache.sling.feature.Requirement;
import org.apache.sling.feature.support.impl.SimpleFilter;
@@ -37,6 +28,15 @@ import org.osgi.framework.namespace.Exec
import org.osgi.framework.namespace.IdentityNamespace;
import org.osgi.framework.wiring.BundleRevision;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.jar.Manifest;
+
public class ManifestParser
{
private static final String BUNDLE_LICENSE_HEADER = "Bundle-License"; //
No constant defined by OSGi...
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java
Mon Jul 31 22:01:42 2017
@@ -16,6 +16,12 @@
*/
package org.apache.sling.feature.support.util;
+import org.apache.sling.commons.osgi.ManifestHeader;
+import org.apache.sling.feature.Capability;
+import org.apache.sling.feature.Requirement;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Version;
+
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -26,12 +32,6 @@ import java.util.jar.JarFile;
import java.util.jar.Manifest;
import java.util.stream.Collectors;
-import org.apache.sling.commons.osgi.ManifestHeader;
-import org.apache.sling.feature.Capability;
-import org.apache.sling.feature.Requirement;
-import org.osgi.framework.Constants;
-import org.osgi.framework.Version;
-
import static
org.apache.sling.feature.support.util.ManifestParser.convertProvideCapabilities;
import static
org.apache.sling.feature.support.util.ManifestParser.normalizeCapabilityClauses;
import static
org.apache.sling.feature.support.util.ManifestParser.parseStandardHeader;
Modified:
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/ArtifactManagerTest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/ArtifactManagerTest.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/ArtifactManagerTest.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/ArtifactManagerTest.java
Mon Jul 31 22:01:42 2017
@@ -16,18 +16,18 @@
*/
package org.apache.sling.feature.support;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import org.apache.sling.feature.support.spi.ArtifactProvider;
+import org.junit.Test;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.feature.support.spi.ArtifactProvider;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
public class ArtifactManagerTest {
Modified:
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/FeatureUtilTest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/FeatureUtilTest.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/FeatureUtilTest.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/FeatureUtilTest.java
Mon Jul 31 22:01:42 2017
@@ -16,14 +16,14 @@
*/
package org.apache.sling.feature.support;
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
public class FeatureUtilTest {
Modified:
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONReaderTest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONReaderTest.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONReaderTest.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONReaderTest.java
Mon Jul 31 22:01:42 2017
@@ -16,17 +16,17 @@
*/
package org.apache.sling.feature.support.json;
+import org.apache.sling.feature.Configuration;
+import org.apache.sling.feature.Feature;
+import org.junit.Test;
+
+import java.util.List;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-import java.util.List;
-
-import org.apache.sling.feature.Configuration;
-import org.apache.sling.feature.Feature;
-import org.junit.Test;
-
public class FeatureJSONReaderTest {
@Test public void testRead() throws Exception {
Modified:
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONWriterTest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONWriterTest.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONWriterTest.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONWriterTest.java
Mon Jul 31 22:01:42 2017
@@ -16,13 +16,13 @@
*/
package org.apache.sling.feature.support.json;
-import static org.junit.Assert.assertEquals;
+import org.apache.sling.feature.Feature;
+import org.junit.Test;
import java.io.StringReader;
import java.io.StringWriter;
-import org.apache.sling.feature.Feature;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
public class FeatureJSONWriterTest {
Modified:
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/U.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/U.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/U.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/U.java
Mon Jul 31 22:01:42 2017
@@ -16,12 +16,11 @@
*/
package org.apache.sling.feature.support.json;
+import org.apache.sling.feature.Feature;
+
import java.io.InputStreamReader;
import java.io.Reader;
-import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.support.json.FeatureJSONReader;
-
/** Test utilities */
public class U {
Modified:
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Capability.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Capability.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Capability.java
(original)
+++
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Capability.java
Mon Jul 31 22:01:42 2017
@@ -16,7 +16,7 @@
*/
package org.apache.sling.feature;
-import java.util.*;
+import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
Modified:
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java
(original)
+++
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java
Mon Jul 31 22:01:42 2017
@@ -16,16 +16,16 @@
*/
package org.apache.sling.feature.process;
+import org.apache.sling.feature.Application;
+import org.apache.sling.feature.ArtifactId;
+import org.apache.sling.feature.Feature;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.sling.feature.Application;
-import org.apache.sling.feature.ArtifactId;
-import org.apache.sling.feature.Feature;
-
/**
* Build an application based on features.
*/
Modified:
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderUtil.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderUtil.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderUtil.java
(original)
+++
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderUtil.java
Mon Jul 31 22:01:42 2017
@@ -16,18 +16,6 @@
*/
package org.apache.sling.feature.process;
-import java.io.StringReader;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
-import javax.json.JsonValue.ValueType;
-
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.Bundles;
import org.apache.sling.feature.Capability;
@@ -38,6 +26,17 @@ import org.apache.sling.feature.Extensio
import org.apache.sling.feature.KeyValueMap;
import org.apache.sling.feature.Requirement;
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+import javax.json.JsonStructure;
+import javax.json.JsonValue;
+import javax.json.JsonValue.ValueType;
+import java.io.StringReader;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+
/**
* Utility methods for the builders
*/
Modified:
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/FeatureBuilder.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/FeatureBuilder.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/FeatureBuilder.java
(original)
+++
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/FeatureBuilder.java
Mon Jul 31 22:01:42 2017
@@ -16,12 +16,6 @@
*/
package org.apache.sling.feature.process;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Configuration;
@@ -29,6 +23,12 @@ import org.apache.sling.feature.Extensio
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.Include;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
public class FeatureBuilder {
/**
Modified:
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/ArtifactIdTest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/ArtifactIdTest.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/ArtifactIdTest.java
(original)
+++
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/ArtifactIdTest.java
Mon Jul 31 22:01:42 2017
@@ -16,11 +16,11 @@
*/
package org.apache.sling.feature;
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-
public class ArtifactIdTest {
private static final String G = "g";
Modified:
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/BundlesTest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/BundlesTest.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/BundlesTest.java
(original)
+++
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/BundlesTest.java
Mon Jul 31 22:01:42 2017
@@ -16,11 +16,11 @@
*/
package org.apache.sling.feature;
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
import java.util.Map;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
public class BundlesTest {
Modified:
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/process/BuilderUtilTest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/process/BuilderUtilTest.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/process/BuilderUtilTest.java
(original)
+++
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/process/BuilderUtilTest.java
Mon Jul 31 22:01:42 2017
@@ -16,19 +16,19 @@
*/
package org.apache.sling.feature.process;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Bundles;
import org.apache.sling.feature.process.BuilderUtil.ArtifactMerge;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class BuilderUtilTest {
private List<Map.Entry<Integer, Artifact>> getBundles(final Bundles f) {
Modified:
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/process/FeatureBuilderTest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/process/FeatureBuilderTest.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/process/FeatureBuilderTest.java
(original)
+++
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/process/FeatureBuilderTest.java
Mon Jul 31 22:01:42 2017
@@ -16,16 +16,6 @@
*/
package org.apache.sling.feature.process;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Capability;
@@ -36,6 +26,16 @@ import org.apache.sling.feature.Include;
import org.apache.sling.feature.Requirement;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class FeatureBuilderTest {
private static final Map<String, Feature> FEATURES = new HashMap<>();
Modified:
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ApplicationProjectInfo.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ApplicationProjectInfo.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ApplicationProjectInfo.java
(original)
+++
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ApplicationProjectInfo.java
Mon Jul 31 22:01:42 2017
@@ -16,10 +16,10 @@
*/
package org.apache.sling.feature.maven;
-import java.util.List;
-
import org.apache.sling.feature.Feature;
+import java.util.List;
+
public class ApplicationProjectInfo extends ProjectInfo {
public List<Feature> features;
Modified:
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Environment.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Environment.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Environment.java
(original)
+++
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Environment.java
Mon Jul 31 22:01:42 2017
@@ -16,14 +16,14 @@
*/
package org.apache.sling.feature.maven;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.execution.MavenSession;
import org.codehaus.plexus.logging.Logger;
+import java.util.HashMap;
+import java.util.Map;
+
public class Environment {
public ArtifactHandlerManager artifactHandlerManager;
Modified:
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
(original)
+++
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
Mon Jul 31 22:01:42 2017
@@ -16,16 +16,6 @@
*/
package org.apache.sling.feature.maven;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
import org.apache.sling.feature.Artifact;
@@ -33,12 +23,22 @@ import org.apache.sling.feature.Artifact
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.support.json.FeatureJSONReader;
import org.apache.sling.feature.process.FeatureBuilder;
import org.apache.sling.feature.process.FeatureProvider;
import org.apache.sling.feature.support.FeatureUtil;
+import org.apache.sling.feature.support.json.FeatureJSONReader;
import org.codehaus.plexus.logging.Logger;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
/**
* The processor processes all feature projects.
*/
Modified:
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
(original)
+++
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
Mon Jul 31 22:01:42 2017
@@ -16,14 +16,6 @@
*/
package org.apache.sling.feature.maven;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -42,6 +34,14 @@ import org.apache.sling.feature.support.
import org.apache.sling.feature.support.json.FeatureJSONWriter;
import org.codehaus.plexus.util.xml.Xpp3Dom;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
public abstract class ProjectHelper {
/** Read feature. */
