moved the configs to gateway

modules/analytics/distribution/ds_config.xml

@@ -6,27 +6,6 @@
             <jndiConfig>
                 <name>jdbc/WSO2CarbonDB</name>
             </jndiConfig>
-            <definition type="RDBMS">
-                <configuration>
-                    <url>jdbc:h2:./repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000</url>
-                    <username>wso2carbon</username>
-                    <password>wso2carbon</password>
-                    <driverClassName>org.h2.Driver</driverClassName>
-                    <maxActive>50</maxActive>
-                    <maxWait>60000</maxWait>
-                    <testOnBorrow>true</testOnBorrow>
-                    <validationQuery>SELECT 1</validationQuery>
-                    <validationInterval>30000</validationInterval>
-                    <defaultAutoCommit>false</defaultAutoCommit>
-                </configuration>
-            </definition>
-        </datasource>
-        <datasource>
-            <name>WSO2_UM_DB</name>
-            <description>The datasource used for registry and user manager</description>
-            <jndiConfig>
-                <name>jdbc/WSO2UMDB</name>
-            </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
                     <url>jdbc:h2:../core/repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=9095</url>

modules/analytics/distribution/output-adapter-change.xml

@@ -27,10 +27,10 @@
         <property key="maximumTotalHttpConnection">100</property>
         <property key="authorizer">org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.DeviceAuthorizer</property>
        	<property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</property>
-        <property key="deviceMgtServerUrl">https://${iot.core.host}:${iot.core.https.port}</property>
+        <property key="deviceMgtServerUrl">https://${iot.gateway.host}:${iot.gateway.https.port}</property>
         <property key="username">admin</property>
         <property key="password">admin</property>
-   		<property key="scopes"></property>
+   		<property key="scopes">perm:authorization:verify</property>
         <!--websocket connection permissions which are validated for grouping (can have multiple permission.)-->
         <property key="statsPermission">/permission/device-mgt/realtime_analytics</property>
         <!--offset time from expiry time to trigger refresh call (in seconds)-->

modules/analytics/distribution/pom.xml

@@ -176,7 +176,6 @@
                                 <!-- commenting "GetAllRolesOfUserEnabled" property to fix
                               https://wso2.org/jira/browse/IDENTITY-3489 -->
                                 <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt;" value="&lt;!--Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property--&gt;" />
-                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;Property name=&quot;dataSource&quot;&gt;jdbc/WSO2CarbonDB&lt;/Property&gt;" value="&lt;Property name=&quot;dataSource&quot;&gt;jdbc/WSO2UMDB&lt;/Property&gt;" />
                                 <!-- Move IS UI to configure menu -->
                                 <property name="tempdir2" value="target/identity-ui" />
                                 <mkdir dir="${tempdir2}" />

modules/analytics/distribution/src/bin/wso2server.bat

@@ -196,7 +196,7 @@ set CARBON_CLASSPATH=.\lib;%CARBON_CLASSPATH%
 
 set JAVA_ENDORSED=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
 
-set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof"  -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dlogger.server.name="IoT-Analytics" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcatalina.base="%CARBON_HOME%\lib\tomcat" -Dwso2.carbon.xml=%CARBON_HOME%\repository\conf\carbon.xml -Dwso2.registry.xml="%CARBON_HOME%\repository\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\repository\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\repository\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\conf"  -Dcomponents.repo="%CARBON_HOME%\repository\components" -Dconf.location="%CARBON_HOME%\repository\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path="true" -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.core.host="localhost" -Diot.core.https.port="9443" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9443" -Diot.gatway.host="localhost" -Diot.gateway.https.port="8243" -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8
+set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof"  -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dlogger.server.name="IoT-Analytics" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcatalina.base="%CARBON_HOME%\lib\tomcat" -Dwso2.carbon.xml=%CARBON_HOME%\repository\conf\carbon.xml -Dwso2.registry.xml="%CARBON_HOME%\repository\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\repository\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\repository\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\conf"  -Dcomponents.repo="%CARBON_HOME%\repository\components" -Dconf.location="%CARBON_HOME%\repository\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path="true" -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9443" -Diot.gatway.host="localhost" -Diot.gateway.https.port="8243" -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8
 
 :runJava
 echo JAVA_HOME environment variable is set to %JAVA_HOME%

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

@@ -324,8 +324,6 @@ do
     -Dcom.ibm.cacheLocalHost=true \
     -Dmqtt.broker.host="localhost" \
     -Dmqtt.broker.port="1886" \
-    -Diot.core.host="localhost" \
-    -Diot.core.https.port="9443" \
     -Diot.keymanager.host="localhost" \
     -Diot.keymanager.https.port="9443" \
     -Diot.gateway.host="localhost" \

modules/broker/distribution/src/main/conf/broker.xml

@@ -188,7 +188,7 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c
                         <property name="tokenEndpoint">https://localhost:9443/oauth2</property>
                         <!--offset time from expiry time to trigger refresh call - seconds -->
                         <property name="tokenRefreshTimeOffset">100</property>
-                        <property name="deviceMgtServerUrl">https://localhost:9443</property>
+                        <property name="deviceMgtServerUrl">https://localhost:8243</property>
                     </authorizer>
             </security>
         </mqtt>

modules/core/distribution/output-adapter-change.xml

@@ -27,10 +27,10 @@
         <property key="maximumTotalHttpConnection">100</property>
         <property key="authorizer">org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.DeviceAuthorizer</property>
        	<property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</property>
-        <property key="deviceMgtServerUrl">https://${iot.core.host}:${iot.core.https.port}</property>
+        <property key="deviceMgtServerUrl">https://${iot.gateway.host}:${iot.gateway.https.port}</property>
         <property key="username">admin</property>
         <property key="password">admin</property>
-   		<property key="scopes"></property>
+   		<property key="scopes">perm:authorization:verify</property>
         <!--websocket connection permissions which are validated for grouping (can have multiple permission.)-->
         <property key="statsPermission">/permission/device-mgt/realtime_analytics</property>
         <!--offset time from expiry time to trigger refresh call (in seconds)-->

modules/distribution/src/assembly/dist.xml

@@ -45,14 +45,14 @@
                 <include>*/**</include>
             </includes>
         </fileSet>
-        <fileSet>
+        <!--<fileSet>-->
-            <directory>src/resources/bin</directory>
+            <!--<directory>src/resources/bin</directory>-->
-            <outputDirectory>wso2iot-${product.iot.version}/bin</outputDirectory>
+            <!--<outputDirectory>wso2iot-${product.iot.version}/bin</outputDirectory>-->
-            <includes>
+            <!--<includes>-->
-                <include>*/**</include>
+                <!--<include>*/**</include>-->
-            </includes>
+            <!--</includes>-->
-            <fileMode>755</fileMode>
+            <!--<fileMode>755</fileMode>-->
-        </fileSet>
+        <!--</fileSet>-->
         <fileSet>
             <directory>src/resources/plugins</directory>
             <outputDirectory>wso2iot-${product.iot.version}/plugins</outputDirectory>