Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0

modules/distribution/src/core/bin/analytics.sh

@@ -61,10 +61,6 @@ ANALYTICS_INIT_SCRIPT="$CARBON_HOME/wso2/analytics/bin/wso2server.sh"
 
 # If the daemon is not there, then exit.
 
-sh $ANALYTICS_INIT_SCRIPT $* &
+$ANALYTICS_INIT_SCRIPT $*
+exit;
 
-trap "sh $ANALYTICS_INIT_SCRIPT stop; exit;" INT TERM
-while :
-do
-        sleep 60
-done

modules/distribution/src/core/bin/broker.sh

@@ -61,10 +61,5 @@ BROKER_INIT_SCRIPT="$CARBON_HOME/wso2/broker/bin/wso2server.sh"
 
 # If the daemon is not there, then exit.
 
-sh $BROKER_INIT_SCRIPT $* &
+$BROKER_INIT_SCRIPT $*
-
+exit;
-trap "sh $BROKER_INIT_SCRIPT stop; exit;" INT TERM
-while :
-do
-        sleep 60
-done

modules/distribution/src/core/bin/iot-server.sh

@@ -181,7 +181,7 @@ elif [ "$CMD" = "start" ]; then
   fi
   export CARBON_HOME=$CARBON_HOME
 # using nohup sh to avoid erros in solaris OS.TODO
-  nohup sh $CARBON_HOME/bin/wso2server.sh $args > /dev/null 2>&1 &
+  nohup sh $CARBON_HOME/bin/iot-server.sh $args > /dev/null 2>&1 &
   exit 0
 elif [ "$CMD" = "stop" ]; then
   export CARBON_HOME=$CARBON_HOME
@@ -200,7 +200,7 @@ elif [ "$CMD" = "restart" ]; then
   done
 
 # using nohup sh to avoid erros in solaris OS.TODO
-  nohup sh $CARBON_HOME/bin/wso2server.sh $args > /dev/null 2>&1 &
+  nohup sh $CARBON_HOME/bin/iot-server.sh $args > /dev/null 2>&1 &
   exit 0
 elif [ "$CMD" = "test" ]; then
     JAVACMD="exec "$JAVACMD""

modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java

@@ -60,8 +60,7 @@ public class MobileDeviceManagementWithNoDevices extends TestBase {
             TimeUnit.SECONDS.sleep(5);
             long WAIT_TIME = 40000;
             if (System.currentTimeMillis() - startTime > WAIT_TIME) {
-                Assert.fail("Required APIs are not deployed after waiting for " + WAIT_TIME + " ms time-out has "
+                Assert.fail("Required APIs are not deployed after waiting for " + WAIT_TIME + " time-out has happened");
-                        + "happened");
             }
         }
     }

modules/integration/tests-integration/src/test/resources/jmeter-scripts/AndroidDeviceManagementAPIAdditionalPermutations.jmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jmeterTestPlan version="1.2" properties="2.2">
+<jmeterTestPlan version="1.2" properties="2.9" jmeter="3.0 r1743807">
   <hashTree>
     <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Android Device Management API" enabled="true">
       <stringProp name="TestPlan.comments"></stringProp>
@@ -10206,7 +10206,15 @@ vars.put(&quot;base64encodedId&quot;,new String(encryptedId));</stringProp>
         </hashTree>
         <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Device Management Call 131" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="limit" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">100</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">limit</stringProp>
+              </elementProp>
+            </collectionProp>
           </elementProp>
           <stringProp name="HTTPSampler.domain">${host}</stringProp>
           <stringProp name="HTTPSampler.port">${https_port}</stringProp>