Author: pderop
Date: Sat Feb 26 22:25:16 2011
New Revision: 1074942
URL: http://svn.apache.org/viewvc?rev=1074942&view=rev
Log:
misc cleanup
Modified:
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/JSONMetaData.java
felix/trunk/dependencymanager/samples.annotation/README
Modified:
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/JSONMetaData.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/JSONMetaData.java?rev=1074942&r1=1074941&r2=1074942&view=diff
==============================================================================
---
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/JSONMetaData.java
(original)
+++
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/JSONMetaData.java
Sat Feb 26 22:25:16 2011
@@ -39,8 +39,8 @@ public class JSONMetaData implements Met
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
*/
Modified: felix/trunk/dependencymanager/samples.annotation/README
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/samples.annotation/README?rev=1074942&r1=1074941&r2=1074942&view=diff
==============================================================================
--- felix/trunk/dependencymanager/samples.annotation/README (original)
+++ felix/trunk/dependencymanager/samples.annotation/README Sat Feb 26 22:25:16
2011
@@ -29,8 +29,10 @@ How to test:
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 @@ How to test:
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
