This is an automated email from the ASF dual-hosted git repository.
pauls 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 67133f6 SLING-9670: add a new unpack extension for the feature model.
67133f6 is described below
commit 67133f67cc8cd43c0bea680aba39e5bd9c9ebebc
Author: Karl Pauls <[email protected]>
AuthorDate: Wed Aug 19 10:01:14 2020 +0200
SLING-9670: add a new unpack extension for the feature model.
---
.../apache/sling/feature/extension/unpack/Unpack.java | 16 ++++++++--------
.../impl/{ => installer}/InstallUnpackArchiveTask.java | 8 ++++----
.../{ => installer}/UnpackArchiveExtensionHandler.java | 2 +-
.../{ => installer}/UnpackArchiveInstallerPlugin.java | 18 +++++++++---------
.../{ => impl/launcher}/UnpackLauncherExtension.java | 3 ++-
...ng.feature.launcher.spi.extensions.ExtensionHandler | 2 +-
.../{ => installer}/InstallUnpackArchiveTaskTest.java | 2 +-
.../UnpackArchiveExtensionHandlerTest.java | 2 +-
.../UnpackArchiveInstallerPluginTest.java | 2 +-
9 files changed, 28 insertions(+), 27 deletions(-)
diff --git
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/Unpack.java
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/Unpack.java
index 9dfdaf0..ca420fd 100644
---
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/Unpack.java
+++
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/Unpack.java
@@ -19,14 +19,6 @@
package org.apache.sling.feature.extension.unpack;
-import org.apache.felix.utils.manifest.Clause;
-import org.apache.felix.utils.manifest.Directive;
-import org.apache.felix.utils.manifest.Parser;
-import org.apache.sling.feature.Artifact;
-import org.apache.sling.feature.Extension;
-import org.apache.sling.feature.ExtensionType;
-import org.apache.sling.feature.builder.ArtifactProvider;
-
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -47,6 +39,14 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.zip.ZipEntry;
+import org.apache.felix.utils.manifest.Clause;
+import org.apache.felix.utils.manifest.Directive;
+import org.apache.felix.utils.manifest.Parser;
+import org.apache.sling.feature.Artifact;
+import org.apache.sling.feature.Extension;
+import org.apache.sling.feature.ExtensionType;
+import org.apache.sling.feature.builder.ArtifactProvider;
+
public class Unpack
{
private final Map<String, Map<String, String>> registry;
diff --git
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/InstallUnpackArchiveTask.java
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/installer/InstallUnpackArchiveTask.java
similarity index 96%
rename from
featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/InstallUnpackArchiveTask.java
rename to
featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/installer/InstallUnpackArchiveTask.java
index a7ea946..4c2e859 100644
---
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/InstallUnpackArchiveTask.java
+++
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/installer/InstallUnpackArchiveTask.java
@@ -16,7 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.feature.extension.unpack.impl;
+package org.apache.sling.feature.extension.unpack.impl.installer;
+
+import java.io.IOException;
+import java.util.Map;
import org.apache.sling.feature.extension.unpack.Unpack;
import org.apache.sling.installer.api.tasks.InstallTask;
@@ -24,9 +27,6 @@ import
org.apache.sling.installer.api.tasks.InstallationContext;
import org.apache.sling.installer.api.tasks.TaskResourceGroup;
import org.slf4j.Logger;
-import java.io.IOException;
-import java.util.Map;
-
public class InstallUnpackArchiveTask extends InstallTask {
private final Logger logger;
diff --git
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveExtensionHandler.java
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/installer/UnpackArchiveExtensionHandler.java
similarity index 96%
rename from
featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveExtensionHandler.java
rename to
featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/installer/UnpackArchiveExtensionHandler.java
index 1d1b846..5007a24 100644
---
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveExtensionHandler.java
+++
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/installer/UnpackArchiveExtensionHandler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.feature.extension.unpack.impl;
+package org.apache.sling.feature.extension.unpack.impl.installer;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Extension;
diff --git
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveInstallerPlugin.java
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/installer/UnpackArchiveInstallerPlugin.java
similarity index 98%
rename from
featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveInstallerPlugin.java
rename to
featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/installer/UnpackArchiveInstallerPlugin.java
index e5185b7..a667b37 100644
---
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveInstallerPlugin.java
+++
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/installer/UnpackArchiveInstallerPlugin.java
@@ -16,7 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.feature.extension.unpack.impl;
+package org.apache.sling.feature.extension.unpack.impl.installer;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.extension.unpack.Unpack;
@@ -35,14 +43,6 @@ import org.osgi.service.component.annotations.Component;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
@Component(service = { InstallTaskFactory.class, ResourceTransformer.class })
public class UnpackArchiveInstallerPlugin implements InstallTaskFactory,
ResourceTransformer {
public static final String TYPE_UNPACK_ARCHIVE = "unpackarchive";
diff --git
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/UnpackLauncherExtension.java
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/launcher/UnpackLauncherExtension.java
similarity index 95%
rename from
featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/UnpackLauncherExtension.java
rename to
featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/launcher/UnpackLauncherExtension.java
index 7301312..9ac86c5 100644
---
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/UnpackLauncherExtension.java
+++
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/launcher/UnpackLauncherExtension.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.feature.extension.unpack;
+package org.apache.sling.feature.extension.unpack.impl.launcher;
import java.io.IOException;
import java.io.UncheckedIOException;
@@ -26,6 +26,7 @@ import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.builder.ArtifactProvider;
+import org.apache.sling.feature.extension.unpack.Unpack;
import org.apache.sling.feature.launcher.spi.extensions.ExtensionContext;
import org.apache.sling.feature.launcher.spi.extensions.ExtensionHandler;
diff --git
a/featuremodel-unpack-extension/src/main/resources/META-INF/services/org.apache.sling.feature.launcher.spi.extensions.ExtensionHandler
b/featuremodel-unpack-extension/src/main/resources/META-INF/services/org.apache.sling.feature.launcher.spi.extensions.ExtensionHandler
index 6e23e5a..8cdb204 100644
---
a/featuremodel-unpack-extension/src/main/resources/META-INF/services/org.apache.sling.feature.launcher.spi.extensions.ExtensionHandler
+++
b/featuremodel-unpack-extension/src/main/resources/META-INF/services/org.apache.sling.feature.launcher.spi.extensions.ExtensionHandler
@@ -1 +1 @@
-org.apache.sling.feature.extension.unpack.UnpackLauncherExtension
\ No newline at end of file
+org.apache.sling.feature.extension.unpack.impl.launcher.UnpackLauncherExtension
\ No newline at end of file
diff --git
a/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/InstallUnpackArchiveTaskTest.java
b/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/installer/InstallUnpackArchiveTaskTest.java
similarity index 97%
rename from
featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/InstallUnpackArchiveTaskTest.java
rename to
featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/installer/InstallUnpackArchiveTaskTest.java
index a9dfc2c..33c2818 100644
---
a/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/InstallUnpackArchiveTaskTest.java
+++
b/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/installer/InstallUnpackArchiveTaskTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.feature.extension.unpack.impl;
+package org.apache.sling.feature.extension.unpack.impl.installer;
import org.apache.sling.feature.extension.unpack.Unpack;
import org.apache.sling.installer.api.tasks.TaskResource;
diff --git
a/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveExtensionHandlerTest.java
b/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/installer/UnpackArchiveExtensionHandlerTest.java
similarity index 97%
rename from
featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveExtensionHandlerTest.java
rename to
featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/installer/UnpackArchiveExtensionHandlerTest.java
index 7c28a17..53d7e3f 100644
---
a/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveExtensionHandlerTest.java
+++
b/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/installer/UnpackArchiveExtensionHandlerTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.feature.extension.unpack.impl;
+package org.apache.sling.feature.extension.unpack.impl.installer;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.builder.ArtifactProvider;
diff --git
a/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveInstallerPluginTest.java
b/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/installer/UnpackArchiveInstallerPluginTest.java
similarity index 99%
rename from
featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveInstallerPluginTest.java
rename to
featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/installer/UnpackArchiveInstallerPluginTest.java
index 105dd27..e5d4301 100644
---
a/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveInstallerPluginTest.java
+++
b/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/installer/UnpackArchiveInstallerPluginTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.feature.extension.unpack.impl;
+package org.apache.sling.feature.extension.unpack.impl.installer;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.extension.unpack.Unpack;
