misc cleanup
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1074942 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/JSONMetaData.java b/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/JSONMetaData.java
index 217a01e..c1f43d9 100644
--- a/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/JSONMetaData.java
+++ b/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/JSONMetaData.java
@@ -39,8 +39,8 @@
private HashMap<String, Object> m_metadata = new HashMap<String, Object>();
/**
- * Decodes a JSON metadata for either a Service or a Dependency descriptor entry.
- * The JSON object values contains either some of the following types: a String, a String[], or a Dictionary of String/String[].
+ * Decodes SON metadata for either a Service or a Dependency descriptor entry.
+ * The JSON object contains some of the following types: a String, a String[], or a Dictionary of String/String[].
* @param jso the JSON object that corresponds to a dependency manager descriptor entry line.
* @throws JSONException
*/
diff --git a/dependencymanager/samples.annotation/README b/dependencymanager/samples.annotation/README
index c981a7b..d976267 100644
--- a/dependencymanager/samples.annotation/README
+++ b/dependencymanager/samples.annotation/README
@@ -29,8 +29,10 @@
org.apache.felix.configadmin-1.2.8.jar
org.apache.felix.metatype-1.0.4.jar
- org.apache.felix.http.jetty-2.0.4.jar
- org.apache.felix.webconsole-3.1.2.jar
+ org.apache.felix.http.jetty-2.2.0.jar
+ org.apache.felix.log-1.0.0.jar (optional)
+ org.apache.felix.webconsole-3.1.8.jar
+ org.apache.felix.shell-1.4.2.jar
- compile dependency manager from trunk:
@@ -49,21 +51,23 @@
At this point, you should have the following running bundles:
+ g! lb
START LEVEL 1
- ID|State |Level|Name
- 0|Active | 0|System Bundle (3.0.1)
- 1|Active | 1|Apache Felix Bundle Repository (1.6.2)
- 7|Active | 1|Apache Felix Gogo Command (0.6.0)
- 8|Active | 1|Apache Felix Gogo Runtime (0.6.0)
- 9|Active | 1|Apache Felix Gogo Shell (0.6.0)
- 10|Active | 1|Apache Felix Http Jetty (2.0.4)
- 11|Active | 1|Apache Felix Metatype Service (1.0.4)
- 12|Active | 1|Apache Felix Web Management Console (3.1.2)
- 2|Active | 1|Apache Felix Configuration Admin Service (1.2.4)
- 3|Active | 1|Apache Felix Dependency Manager (3.0.0.SNAPSHOT)
- 6|Active | 1|Apache Felix Dependency Manager Shell (3.0.0.SNAPSHOT)
- 4|Active | 1|Apache Felix Dependency Manager Runtime (3.0.0.SNAPSHOT)
- 5|Active | 1|Apache Felix Dependency Manager Annotation Sample (3.0.0.SNAPSHOT)
+ ID|State |Level|Name
+ 0|Active | 0|System Bundle (3.0.8)
+ 1|Active | 1|Apache Felix Bundle Repository (1.6.2)
+ 2|Active | 1|Apache Felix Configuration Admin Service (1.2.8)
+ 7|Active | 1|Apache Felix Gogo Command (0.8.0)
+ 8|Active | 1|Apache Felix Gogo Runtime (0.8.0)
+ 9|Active | 1|Apache Felix Gogo Shell (0.8.0)
+ 10|Active | 1|Apache Felix Http Jetty (2.2.0)
+ 11|Active | 1|Apache Felix Log Service (1.0.0)
+ 12|Active | 1|Apache Felix Metatype Service (1.0.4)
+ 13|Active | 1|Apache Felix Web Management Console (3.1.8)
+ 14|Active | 1|Apache Felix Dependency Manager (3.0.0.SNAPSHOT)
+ 16|Active | 1|Apache Felix Dependency Manager Runtime (3.0.0.SNAPSHOT)
+ 17|Active | 1|Apache Felix Dependency Manager Shell (3.0.0.SNAPSHOT)
+ 18|Active | 1|Apache Felix Dependency Manager Annotation Sample (3.0.0.SNAPSHOT)
- Go to web console: in the Configuration panel, edit the "Dictionary Services"
Configuration, add some dictionaries. By default, an English dictionary is displayed. Just