[21/50] [abbrv] stratos git commit: Changed variable names, method names according to standards. Used print usage method to print the usage of a command. Removed unused constants in RestCommandLineService class.

[la...@apache.org]

http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CliUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CliUtils.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CliUtils.java
index 532e046..d8b661e 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CliUtils.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CliUtils.java
@@ -20,6 +20,8 @@ package org.apache.stratos.cli.utils;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -34,9 +36,6 @@ import java.net.SocketException;
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-
 public class CliUtils {
     private static Log log = LogFactory.getLog(CliUtils.class);
 
@@ -117,7 +116,7 @@ public class CliUtils {
 
             while (line != null) {
                 sb.append(line);
-                sb.append("\n");
+                sb.append(System.lineSeparator());
                 line = br.readLine();
             }
             return sb.toString();

http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/samples/application-policies/application-policy-2.json
----------------------------------------------------------------------
diff --git a/samples/application-policies/application-policy-2.json b/samples/application-policies/application-policy-2.json
index fc1f04c..b18751c 100644
--- a/samples/application-policies/application-policy-2.json
+++ b/samples/application-policies/application-policy-2.json
@@ -3,6 +3,16 @@
     "algorithm":"all-at-once",
     "networkPartitions":[
         "network-partition-3"
+    ],
+    "properties":[
+        {
+            "name": "key-1",
+            "value": "value-1"
+        },
+        {
+            "name": "key-2",
+            "value": "value-2"
+        }
     ]
 }
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/samples/application-policies/application-policy-3.json
----------------------------------------------------------------------
diff --git a/samples/application-policies/application-policy-3.json b/samples/application-policies/application-policy-3.json
index d720def..704ba2c 100644
--- a/samples/application-policies/application-policy-3.json
+++ b/samples/application-policies/application-policy-3.json
@@ -11,9 +11,7 @@
     "properties":[
         {
             "name": "network-partition-groups",
-            "value": "network-partition-1|network-partition-2, 
-                      network-partition-3, 
-                      network-partition-4|network-partition-5"
+            "value": "network-partition-1|network-partition-2, network-partition-3, network-partition-4|network-partition-5"
         }
     ]
 }