You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2020/08/18 11:06:41 UTC
[sling-whiteboard] 02/02: Some cleanup of removed code
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
commit 9728e39677b9c20c841553a899cf047eb2d51533
Author: David Bosschaert <bo...@adobe.com>
AuthorDate: Tue Aug 18 12:06:00 2020 +0100
Some cleanup of removed code
---
.../impl/BinaryArtifactExtensionHandler.java | 44 ----------------------
.../unpack/impl/BinaryPackageInstallerPlugin.java | 36 ------------------
2 files changed, 80 deletions(-)
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/BinaryArtifactExtensionHandler.java
index 67f6303..1af2b64 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/BinaryArtifactExtensionHandler.java
@@ -35,29 +35,11 @@ import java.util.Map;
public class BinaryArtifactExtensionHandler implements ExtensionHandler {
static final String BINARY_EXTENSIONS_PROP = "org.apache.sling.feature.binary.extensions";
-// private final Map<String, Map<String, String>> binaryExtensions;
-
private final BundleContext bundleContext;
@Activate
public BinaryArtifactExtensionHandler(BundleContext bc) {
bundleContext = bc;
- /*
- Map<String, Map<String, String>> be = new HashMap<>();
-
- // Syntax: system-fonts;dir:=abc;overwrite:=true,customer-fonts;dir:=eft
- Clause[] extClauses = Parser.parseHeader(bc.getProperty(BINARY_EXTENSIONS_PROP));
- for (Clause c : extClauses) {
- Map<String,String> cfg = new HashMap<>();
-
- for (Directive d : c.getDirectives()) {
- cfg.put(d.getName(), d.getValue());
- }
- be.put(c.getName(), Collections.unmodifiableMap(cfg));
- }
-
- binaryExtensions = Collections.unmodifiableMap(be);
- */
}
@Override
@@ -74,32 +56,6 @@ public class BinaryArtifactExtensionHandler implements ExtensionHandler {
context.addInstallableArtifact((ArtifactId) m2.get("artifact.id"), u, m2);
}
);
-
-// return unpack.handle(extension, context.getArtifactProvider(),
-// (u,m) -> context.addInstallableArtifact(u, m));
- /*
-
- if (extension.getType() != ExtensionType.ARTIFACTS ||
- binaryExtensions.get(extension.getName()) == null) {
- return false;
- } else {
- Map<String,String> extensionConfig = binaryExtensions.getOrDefault(extension.getName(),
- Collections.emptyMap());
-
- for (Artifact art : extension.getArtifacts()) {
- URL artifact = context.getArtifactProvider().provide(art.getId());
-
- Hashtable<String,Object> props = new Hashtable<>();
- props.put("artifact.id", art.getId());
- // the props.computeIfAbsent() ensures that entries aren't put in map if they have no value
- props.computeIfAbsent("dir", v -> extensionConfig.get("dir"));
- props.computeIfAbsent("overwrite", v -> extensionConfig.get("overwrite"));
-
- context.addInstallableArtifact(art.getId(), artifact, props);
- }
- return true;
- }
- */
}
}
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/BinaryPackageInstallerPlugin.java
index c38e2d3..375be83 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/BinaryPackageInstallerPlugin.java
@@ -49,21 +49,6 @@ public class BinaryPackageInstallerPlugin implements InstallTaskFactory, Resourc
public static final String BINARY_ARCHIVE_VERSION_HEADER = "Binary-Archive-Version";
public static final String TYPE_BINARY_ARCHIVE = "binaryarchive";
- /*
- @ObjectClassDefinition(name = "Binary Package Installer",
- description = "This component supports installing binary packages into the OSGi installer")
- public @interface Config {
- String directory();
-
- String overwrite() default "true";
-
-// String [] file_extensions() default {".bin", ".fonts"}; // TODO
- }
-
- @Activate
- private Config config;
- */
-
@Activate
private BundleContext bundleContext;
@@ -123,16 +108,6 @@ public class BinaryPackageInstallerPlugin implements InstallTaskFactory, Resourc
tr.setAttributes(attrs);
tr.getAttributes().put("context", attrs);
- /*
- Map<String, Object> attributes = new HashMap<>();
- // TODO try to read attributes from resource
- Object dir = dict.get("dir");
- attributes.put("dir", dir != null ? dir : config.directory());
- Object ow = dict.get("overwrite");
- attributes.put("overwrite", ow != null ? ow : config.overwrite());
- tr.setAttributes(attributes);
- */
-
return new TransformationResult [] {tr};
} catch (IOException e) {
// TODO Auto-generated catch block
@@ -142,17 +117,6 @@ public class BinaryPackageInstallerPlugin implements InstallTaskFactory, Resourc
return null;
}
- /*
- private boolean handledExtension(String url) {
- for (String fe : config.file_extensions()) {
- if (url.endsWith(fe)) {
- return true;
- }
- }
- return false;
- }
- */
-
@Override
public InstallTask createTask(TaskResourceGroup group) {
TaskResource tr = group.getActiveResource();