You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2018/11/21 05:01:19 UTC
[sling-org-apache-sling-feature-io] branch master updated:
SLING-8124 : Remove method to get framework id
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-io.git
The following commit(s) were added to refs/heads/master by this push:
new b30b992 SLING-8124 : Remove method to get framework id
b30b992 is described below
commit b30b992cd752eef55b4cf517e921c50ee7c92798
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Nov 21 06:01:11 2018 +0100
SLING-8124 : Remove method to get framework id
---
src/main/java/org/apache/sling/feature/io/IOUtils.java | 14 --------------
.../apache/sling/feature/io/file/ArtifactHandler.java | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/io/IOUtils.java b/src/main/java/org/apache/sling/feature/io/IOUtils.java
index 9375aff..205052d 100644
--- a/src/main/java/org/apache/sling/feature/io/IOUtils.java
+++ b/src/main/java/org/apache/sling/feature/io/IOUtils.java
@@ -24,8 +24,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import org.apache.sling.feature.ArtifactId;
-
public class IOUtils {
/** The extension for a reference file. */
@@ -157,18 +155,6 @@ public class IOUtils {
return paths;
}
- /**
- * Get an artifact id for the Apache Felix framework
- * @param version The version to use or {@code null} for the default version
- * @return The artifact id
- * @throws IllegalArgumentException If the provided version is invalid
- */
- public static ArtifactId getFelixFrameworkId(final String version) {
- return new ArtifactId("org.apache.felix",
- "org.apache.felix.framework",
- version != null ? version : "6.0.1", null, null);
- }
-
static final Comparator<String> FEATURE_PATH_COMP = new Comparator<String>() {
@Override
public int compare(final String o1, final String o2) {
diff --git a/src/main/java/org/apache/sling/feature/io/file/ArtifactHandler.java b/src/main/java/org/apache/sling/feature/io/file/ArtifactHandler.java
index 5ae472c..e1d4ab0 100644
--- a/src/main/java/org/apache/sling/feature/io/file/ArtifactHandler.java
+++ b/src/main/java/org/apache/sling/feature/io/file/ArtifactHandler.java
@@ -27,15 +27,31 @@ public class ArtifactHandler {
private final File file;
+ /**
+ * Create a new handler.
+ *
+ * @param url The url of the artifact
+ * @param file The file for the artifact
+ */
public ArtifactHandler(final String url, final File file) {
this.url = url;
this.file = file;
}
+ /**
+ * Get the url of the artifact
+ *
+ * @return The url.
+ */
public String getUrl() {
return url;
}
+ /**
+ * Get a file for the artifact
+ *
+ * @return The file
+ */
public File getFile() {
return file;
}