This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new 6565e4d Rename Binary -> Unpack
6565e4d is described below
commit 6565e4db140e5d65435487f6f93385f70e425700
Author: David Bosschaert <[email protected]>
AuthorDate: Tue Aug 18 15:19:35 2020 +0100
Rename Binary -> Unpack
---
...rchiveTask.java => InstallUnpackArchiveTask.java} | 7 +++----
...ndler.java => UnpackArchiveExtensionHandler.java} | 8 ++++----
...Plugin.java => UnpackArchiveInstallerPlugin.java} | 20 +++++++++-----------
3 files changed, 16 insertions(+), 19 deletions(-)
diff --git
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/InstallBinaryArchiveTask.java
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/InstallUnpackArchiveTask.java
similarity index 88%
rename from
featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/InstallBinaryArchiveTask.java
rename to
featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/InstallUnpackArchiveTask.java
index cb53971..7d0ed8b 100644
---
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/InstallBinaryArchiveTask.java
+++
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/InstallUnpackArchiveTask.java
@@ -27,12 +27,12 @@ import org.slf4j.Logger;
import java.io.IOException;
import java.util.Map;
-public class InstallBinaryArchiveTask extends InstallTask {
+public class InstallUnpackArchiveTask extends InstallTask {
private final Logger logger;
private final Unpack unpack;
- public InstallBinaryArchiveTask(TaskResourceGroup erl, Unpack unpack,
Logger logger) {
+ public InstallUnpackArchiveTask(TaskResourceGroup erl, Unpack unpack,
Logger logger) {
super(erl);
this.logger = logger;
@@ -41,12 +41,12 @@ public class InstallBinaryArchiveTask extends InstallTask {
@Override
public void execute(InstallationContext ctx) {
+ @SuppressWarnings("unchecked")
Map<String,Object> context = (Map<String, Object>)
getResource().getAttribute("context");
if (context == null)
return;
try {
- // TODO handle 'Font-Archive-Contents' (or
'Binary-Archive-Contents')?
unpack.unpack(getResource().getInputStream(), context);
} catch (IOException e) {
logger.error("Problem unpacking {}", getResource().getURL(), e);
@@ -55,7 +55,6 @@ public class InstallBinaryArchiveTask extends InstallTask {
@Override
public String getSortKey() {
- // TODO is this right?
return getResource().getEntityId();
}
}
diff --git
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/BinaryArtifactExtensionHandler.java
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveExtensionHandler.java
similarity index 85%
rename from
featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/BinaryArtifactExtensionHandler.java
rename to
featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveExtensionHandler.java
index 8a6af56..438e3e5 100644
---
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/BinaryArtifactExtensionHandler.java
+++
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveExtensionHandler.java
@@ -29,14 +29,14 @@ import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@Component
-public class BinaryArtifactExtensionHandler implements ExtensionHandler {
- static final String BINARY_EXTENSIONS_PROP =
"org.apache.sling.feature.binary.extensions";
+public class UnpackArchiveExtensionHandler implements ExtensionHandler {
+ static final String UNPACK_EXTENSIONS_PROP =
"org.apache.sling.feature.unpack.extensions";
private final Unpack unpack;
@Activate
- public BinaryArtifactExtensionHandler(BundleContext bc) {
- unpack = Unpack.fromMapping(bc.getProperty(BINARY_EXTENSIONS_PROP));
+ public UnpackArchiveExtensionHandler(BundleContext bc) {
+ unpack = Unpack.fromMapping(bc.getProperty(UNPACK_EXTENSIONS_PROP));
}
@Override
diff --git
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/BinaryPackageInstallerPlugin.java
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveInstallerPlugin.java
similarity index 85%
rename from
featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/BinaryPackageInstallerPlugin.java
rename to
featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveInstallerPlugin.java
index 3aae0d2..fbb0843 100644
---
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/BinaryPackageInstallerPlugin.java
+++
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveInstallerPlugin.java
@@ -44,17 +44,16 @@ import java.util.function.Function;
import java.util.stream.Collectors;
@Component(service = { InstallTaskFactory.class, ResourceTransformer.class })
-public class BinaryPackageInstallerPlugin implements InstallTaskFactory,
ResourceTransformer {
- public static final String BINARY_ARCHIVE_VERSION_HEADER =
"Binary-Archive-Version";
- public static final String TYPE_BINARY_ARCHIVE = "binaryarchive";
+public class UnpackArchiveInstallerPlugin implements InstallTaskFactory,
ResourceTransformer {
+ public static final String TYPE_UNPACK_ARCHIVE = "unpackarchive";
private final Logger logger = LoggerFactory.getLogger(this.getClass());
private final Unpack unpack;
@Activate
- public BinaryPackageInstallerPlugin(BundleContext bc) {
- unpack =
Unpack.fromMapping(bc.getProperty(BinaryArtifactExtensionHandler.BINARY_EXTENSIONS_PROP));
+ public UnpackArchiveInstallerPlugin(BundleContext bc) {
+ unpack =
Unpack.fromMapping(bc.getProperty(UnpackArchiveExtensionHandler.UNPACK_EXTENSIONS_PROP));
}
@Override
@@ -91,11 +90,11 @@ public class BinaryPackageInstallerPlugin implements
InstallTaskFactory, Resourc
if (idx2 >= 0) {
name = name.substring(0, idx2);
}
- aid = new ArtifactId("binary.packages", name,
resource.getDigest(), null, null);
+ aid = new ArtifactId("unpack.packages", name,
resource.getDigest(), null, null);
}
TransformationResult tr = new TransformationResult();
- tr.setResourceType(TYPE_BINARY_ARCHIVE);
+ tr.setResourceType(TYPE_UNPACK_ARCHIVE);
tr.setId(aid.getGroupId() + ":" + aid.getArtifactId());
tr.setInputStream(resource.getInputStream());
tr.setAttributes(context);
@@ -111,15 +110,14 @@ public class BinaryPackageInstallerPlugin implements
InstallTaskFactory, Resourc
@Override
public InstallTask createTask(TaskResourceGroup group) {
TaskResource tr = group.getActiveResource();
- if (!TYPE_BINARY_ARCHIVE.equals(tr.getType())) {
+ if (!TYPE_UNPACK_ARCHIVE.equals(tr.getType())) {
return null;
}
- if (tr.getState() == ResourceState.UNINSTALL) {
- // TODO do we need to delete it?
+ if (tr.getState() != ResourceState.INSTALL) {
return null;
}
- return new InstallBinaryArchiveTask(group, unpack, logger);
+ return new InstallUnpackArchiveTask(group, unpack, logger);
}
}
