commit 8bcb4f23ced794400c70119f81a71d76c3ccf1f4
author Jian Li <pyguni@gmail.com> Wed Jan 20 10:36:18 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Jan 20 18:55:28 2016 +0000
tree 8a5bd41d7d988bcda2c5299265724e92b9a65c89
parent 5f9603ded5e652a1a7e6b3d818af54c978db3a6a

[ONOS-3634] Remove readme tag from app.xml

Change-Id: I536f54f74586a0bb5c671564f71b44a0a871d5f6

core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java

diff --git a/core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java b/core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java
index 42f8c9c..6d7dc31 100644
--- a/core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java
+++ b/core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java
@@ -88,7 +88,6 @@
 
     private static final String CATEGORY = "[@category]";
     private static final String URL = "[@url]";
-    private static final String README = "readme";
 
     private static final String ROLE = "security.role";
     private static final String APP_PERMISSIONS = "security.permissions.app-perm";
@@ -307,19 +306,16 @@
         List<String> requiredApps = apps.isEmpty() ?
                 ImmutableList.of() : ImmutableList.copyOf(apps.split(","));
 
-        String desc = cfg.getString(DESCRIPTION);
-        String readme = cfg.getString(README);
+        // put full description to readme field
+        String readme = cfg.getString(DESCRIPTION);
 
-        if (readme == null) {
-            readme = desc;
-        } else {
-            desc = compactDescription(readme);
-        }
+        // put short description to description field
+        String desc = compactDescription(readme);
 
         return new DefaultApplicationDescription(name, version, desc, origin,
-                category, url, readme, icon, role,
-                                                 perms, featuresRepo, features,
-                                                 requiredApps);
+                                                 category, url, readme, icon,
+                                                 role, perms, featuresRepo,
+                                                 features, requiredApps);
     }
 
     // Expands the specified ZIP stream into app-specific directory.
@@ -488,7 +484,7 @@
             if (StringUtils.contains(sentence, ".")) {
                 return StringUtils.substringBefore(sentence, ".") + ".";
             } else {
-                return sentence + ".";
+                return sentence;
             }
         }
         return sentence;