Merge branch 'master' into 'master'

config changes

See merge request entgra/community-product!7

iot-core/pom.xml

@@ -97,9 +97,9 @@
                             <target name="replace dbscripts to avoid tenant creation issue ">
                                 <replace file="target/${wso2am}/dbscripts/db2.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000),"/>
                                 <replace file="target/${wso2am}/dbscripts/h2.sql" token="REG_VALUE        VARCHAR(1000)," value="REG_VALUE        VARCHAR(10000),"/>
-                                <replace file="target/${wso2am}/dbscripts/informix.sql" token="REG_VALUE        VARCHAR(1000)," value="REG_VALUE        VARCHAR(10000),"/>
+                                <replace file="target/${wso2am}/dbscripts/informix.sql" token="REG_VALUE        LVARCHAR(1000)," value="REG_VALUE        LVARCHAR(10000),"/>
                                 <replace file="target/${wso2am}/dbscripts/mssql.sql" token="REG_VALUE        VARCHAR(1000)," value="REG_VALUE        VARCHAR(10000),"/>
-                                <replace file="target/${wso2am}/dbscripts/mysql.sql" token="REG_VALUE        VARCHAR(1000),," value="REG_VALUE        VARCHAR(10000),,"/>
+                                <replace file="target/${wso2am}/dbscripts/mysql.sql" token="REG_VALUE        VARCHAR(1000)," value="REG_VALUE        VARCHAR(10000),"/>
                                 <replace file="target/${wso2am}/dbscripts/mysql_cluster.sql" token="REG_VALUE        VARCHAR(1000)," value="REG_VALUE        VARCHAR(10000),"/>
                                 <replace file="target/${wso2am}/dbscripts/oracle.sql" token="REG_VALUE        VARCHAR2(1000)," value="REG_VALUE        VARCHAR2(10000),"/>
                                 <replace file="target/${wso2am}/dbscripts/oracle.sql" token="REG_VALUE        VARCHAR2(1000)," value="REG_VALUE        VARCHAR2(10000),"/>

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

@@ -361,6 +361,14 @@ do
     -Diot.gateway.http.port="8280" \
     -Diot.gateway.carbon.https.port="9443" \
     -Diot.gateway.carbon.http.port="9763" \
+    -Diot.keymanager.host="localhost" \
+    -Diot.keymanager.https.port="9443" \
+    -Diot.apim.host="localhost" \
+    -Diot.apim.https.port="9443" \
+    -Denable-api-scopes-sharing="true" \
+    -Dagent-bundle="org.wso2.carbon.emm.mdmagent" \
+    -Diot.reporting.event.host="" \
+    -Diot.reporting.webapp.host="" \
     org.wso2.carbon.bootstrap.Bootstrap $*
     status=$?
 done