You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/01/31 02:18:14 UTC
git commit: Use Felix properties natively in InstallKarsMojo
Updated Branches:
refs/heads/master 200946379 -> ca7f2a88d
Use Felix properties natively in InstallKarsMojo
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ca7f2a88
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ca7f2a88
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ca7f2a88
Branch: refs/heads/master
Commit: ca7f2a88da8bdaaeb9efcfa2f6c61d36b5819c0a
Parents: 2009463
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Jan 31 02:17:44 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Jan 31 02:17:44 2014 +0100
----------------------------------------------------------------------
.../karaf/tooling/features/InstallKarsMojo.java | 48 +-------------------
1 file changed, 1 insertion(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca7f2a88/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
index d90ad6a..5e30c3f 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
@@ -26,7 +26,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.lang.reflect.Field;
import java.net.URI;
import java.util.ArrayList;
import java.util.Arrays;
@@ -36,7 +35,6 @@ import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.ListIterator;
-import java.util.Map;
import java.util.Set;
import javax.xml.bind.JAXBException;
@@ -175,7 +173,7 @@ public class InstallKarsMojo extends MojoSupport {
private boolean addTransitiveFeatures = true;
private URI system;
- private CommentProperties startupProperties = new CommentProperties();
+ private Properties startupProperties = new Properties();
private Set<Feature> featureSet = new HashSet<Feature>();
private List<Dependency> missingDependencies = new ArrayList<Dependency>();
@@ -594,48 +592,4 @@ public class InstallKarsMojo extends MojoSupport {
}
}
- // when FELIX-2887 is ready we can use plain Properties again
- private static class CommentProperties extends Properties {
-
- private Map<String, Layout> layout;
- private Map<String, String> storage;
-
- @SuppressWarnings("unchecked")
- public CommentProperties() {
- layout = (Map<String, Layout>) getField("layout");
- storage = (Map<String, String>) getField("storage");
- }
-
- private Object getField(String fieldName) {
- try {
- Field l = Properties.class.getDeclaredField(fieldName);
- boolean old = l.isAccessible();
- l.setAccessible(true);
- Object layout = l.get(this);
- l.setAccessible(old);
- return layout;
- } catch (Exception e) {
- throw new RuntimeException("Could not access field " + fieldName, e);
- }
- }
-
- public String put(String key, String comment, String value) {
- return put(key, Collections.singletonList(comment), value);
- }
-
- public List<String> getRaw(String key) {
- if (layout.containsKey(key)) {
- if (layout.get(key).getValueLines() != null) {
- return new ArrayList<String>(layout.get(key).getValueLines());
- }
- }
- List<String> result = new ArrayList<String>();
- if (storage.containsKey(key)) {
- result.add(storage.get(key));
- }
- return result;
- }
-
- }
-
}