Merge pull request #251 from ayyoob/3.0.0

few changes after testing the cluster and gateway
2025-09-16 23:32:19 +00:00 · 2017-01-13 08:50:54 +05:30 · 2017-01-13 08:50:54 +05:30 · 1f5f3f4e3c
commit 1f5f3f4e3c
parent 38e3f90240 b8706c0437
17 changed files with 126 additions and 96 deletions
--- a/modules/analytics/distribution/ds_config.xml
+++ b/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>
--- a/modules/analytics/distribution/output-adapter-change.xml
+++ b/modules/analytics/distribution/output-adapter-change.xml
@ -27,10 +27,9 @@
        <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>
        <!--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)-->
--- a/modules/analytics/distribution/pom.xml
+++ b/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}" />
--- a/modules/analytics/distribution/src/bin/wso2server.bat
+++ b/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%
--- a/modules/analytics/distribution/src/bin/wso2server.sh
+++ b/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" \
--- a/modules/analytics/distribution/src/repository/conf/etc/jwt.properties
+++ b/modules/analytics/distribution/src/repository/conf/etc/jwt.properties
@ -17,13 +17,13 @@
 #

 #issuer of the JWT
-iss=iot_default
+iss=wso2.org/products/iot

-TokenEndpoint=https://localhost:${iot.core.https.port}/oauth2/token
+TokenEndpoint=https://${iot.keymanager.host}:${iot.keymanager.https.port}/oauth2/token

 #audience of JWT claim
 #comma seperated values
-aud=wso2.org/products/iot
+aud=devicemgt

 #expiration time of JWT (number of minutes from the current time)
 exp=1000
--- a/modules/broker/distribution/src/main/conf/broker.xml
+++ b/modules/broker/distribution/src/main/conf/broker.xml
@ -185,10 +185,10 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c

                        <property name="username">admin</property>
                        <property name="password">admin</property>
-                        <property name="tokenEndpoint">https://localhost:9443/oauth2</property>
+                        <property name="tokenEndpoint">https://localhost:8243</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>
--- a/modules/core/distribution/output-adapter-change.xml
+++ b/modules/core/distribution/output-adapter-change.xml
@ -27,10 +27,9 @@
        <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>
        <!--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)-->
--- a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_Dynamic_Client_Registration_API_.xml
+++ b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_Dynamic_Client_Registration_API_.xml
@ -1,25 +0,0 @@
-<api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2DCRAPI_" context="/dynamic-client-web/register">
-    <resource methods="POST DELETE" url-mapping="/*" faultSequence="_dcr_fault_">
-        <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-            <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
-            <send>
-                <endpoint>
-                    <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/dynamic-client-web/register">
-                        <timeout>
-                            <duration>60000</duration>
-                            <responseAction>fault</responseAction>
-                        </timeout>
-                    </http>
-                </endpoint>
-            </send>
-        </inSequence>
-        <outSequence>
-            <send/>
-        </outSequence>
-    </resource>
-    <handlers>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerCacheExtensionHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
-    </handlers>
-</api>
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@ -449,6 +449,15 @@
            </includes>
        </fileSet>

+		<!-- Copying Authentication Endpoint webapp -->
+		<fileSet>
+			<directory>
+				../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/devicetypes
+			</directory>
+			<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/devicetypes
+			</outputDirectory>
+		</fileSet>
+
        <!-- Copying mdm app from devicemgt app-->
        <fileSet>
            <directory>
--- a/modules/core/distribution/src/repository/bin/wso2server.bat
+++ b/modules/core/distribution/src/repository/bin/wso2server.bat
@ -162,7 +162,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=512m -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-Core" -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 -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=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" -Diot.gateway.https.port="8243"
+set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=512m -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-Core" -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 -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=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" -Diot.gateway.https.port="8243" -Diot.gateway.http.port="8280"

 :runJava
 echo JAVA_HOME environment variable is set to %JAVA_HOME%
--- a/modules/core/distribution/src/repository/bin/wso2server.sh
+++ b/modules/core/distribution/src/repository/bin/wso2server.sh
@ -315,6 +315,7 @@ do
    -Diot.keymanager.https.port="9443" \
    -Diot.gateway.host="localhost" \
    -Diot.gateway.https.port="8243" \
+    -Diot.gateway.http.port="8280" \
    org.wso2.carbon.bootstrap.Bootstrap $*
    status=$?
 done
--- a/modules/core/distribution/src/repository/conf/etc/webapp-publisher-config.xml
+++ b/modules/core/distribution/src/repository/conf/etc/webapp-publisher-config.xml
@ -23,18 +23,18 @@
 -->
 <WebappPublisherConfigs>

-    <!-- This host is used to define the host address which is used to publish APIs -->
-    <Host>https://localhost:${carbon.https.port}</Host>
+	<!-- This host is used to define the host address which is used to publish APIs -->
+	<Host>https://${iot.core.host}:${iot.core.https.port}</Host>

-    <!-- If it is true, the APIs of this instance will be published to the defined host -->
-    <PublishAPI>true</PublishAPI>
+	<!-- If it is true, the APIs of this instance will be published to the defined host -->
+	<PublishAPI>true</PublishAPI>

-    <!-- If it is true, the APIs of this instance will be updated when the webapps are redeployed -->
-    <EnabledUpdateApi>false</EnabledUpdateApi>
+	<!-- If it is true, the APIs of this instance will be updated when the webapps are redeployed -->
+	<EnabledUpdateApi>true</EnabledUpdateApi>

-    <!--Webapp will be published only when running below profiles-->
-    <Profiles>
-        <Profile>default</Profile>
-        <Profile>devicetype-publisher</Profile>
-    </Profiles>
+	<!--Webapp will be published only when running below profiles-->
+	<Profiles>
+		<Profile>default</Profile>
+		<Profile>devicetype-publisher</Profile>
+	</Profiles>
 </WebappPublisherConfigs>
--- a/modules/core/distribution/src/repository/conf/identity/identity-providers/iot_default.xml
+++ b/modules/core/distribution/src/repository/conf/identity/identity-providers/iot_default.xml
@ -17,10 +17,10 @@
  -->

 <IdentityProvider>
-	<IdentityProviderName>iot_default</IdentityProviderName>
-	<DisplayName>iot_default</DisplayName>
+	<IdentityProviderName>wso2.org/products/iot</IdentityProviderName>
+	<DisplayName>wso2.org/products/iot</DisplayName>
 	<IdentityProviderDescription></IdentityProviderDescription>
-	<Alias>wso2.org/products/iot</Alias>
+	<Alias>devicemgt</Alias>
 	<IsPrimary>true</IsPrimary>
 	<IsFederationHub></IsFederationHub>
 	<HomeRealmId></HomeRealmId>
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@ -163,6 +163,15 @@
                                </featureArtifactDef>
 			                    <!-- End of Device Management Features -->

+								<!-- Device Management Plugin Features -->
+								<featureArtifactDef>
+									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version}
+								</featureArtifactDef>
+								<featureArtifactDef>
+									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version}
+								</featureArtifactDef>
+								<!-- End of Device Management Plugin Features -->
+
                                <!-- IoT Device Management Features -->
                                <featureArtifactDef>
                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.adapter.feature:${carbon.device.mgt.plugin.version}
@ -941,6 +950,14 @@
                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
                                    <version>${carbon.device.mgt.version}</version>
                                </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                <!-- End of Device Management Features -->
                                <feature>
                                    <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
@ -1589,6 +1606,10 @@
                                    <id>org.wso2.carbon.module.mgt.server.feature.group</id>
                                    <version>${carbon.deployment.version}</version>
                                </feature>
+								<feature>
+									<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
+									<version>${carbon.analytics.common.version}</version>
+								</feature>
                                <feature>
                                    <id>org.apache.synapse.wso2.feature.group</id>
                                    <version>${carbon.mediation.version}</version>
@ -1859,6 +1880,14 @@
                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                    <version>${carbon.device.mgt.version}</version>
                                </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                <feature>
                                    <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
                                    <version>${carbon.api.mgt.version}</version>
@ -1883,6 +1912,10 @@
                                    <id>org.wso2.carbon.certificate.mgt.api.feature.group</id>
                                    <version>${carbon.device.mgt.version}</version>
                                </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id>
+									<version>${carbon.device.mgt.version}</version>
+								</feature>
                                <feature>
                                    <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
                                    <version>${carbon.device.mgt.version}</version>
@ -1895,6 +1928,10 @@
 									<id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
 									<version>${carbon.device.mgt.version}</version>
 								</feature>
+								<feature>
+									<id>org.wso2.carbon.analytics.api.client.feature.group</id>
+									<version>${carbon.analytics.version}</version>
+								</feature>
                            </features>
                        </configuration>
                    </execution>
@ -2287,6 +2324,10 @@
                                    <id>org.wso2.carbon.dynamic.client.registration.server.feature.group</id>
                                    <version>${carbon.device.mgt.version}</version>
                                </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id>
+									<version>${carbon.device.mgt.version}</version>
+								</feature>

                                <!--required for context.xml-->
                                <feature>
@ -2322,6 +2363,14 @@
                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                    <version>${carbon.device.mgt.version}</version>
                                </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                <feature>
                                    <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
                                    <version>${carbon.api.mgt.version}</version>
@ -2362,6 +2411,10 @@
 									<id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
 									<version>${carbon.device.mgt.version}</version>
 								</feature>
+								<feature>
+									<id>org.wso2.carbon.analytics.api.client.feature.group</id>
+									<version>${carbon.analytics.version}</version>
+								</feature>
                            </features>
                        </configuration>
                    </execution>
@ -2512,6 +2565,14 @@
                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                    <version>${carbon.device.mgt.version}</version>
                                </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                <feature>
                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
                                    <version>${carbon.device.mgt.version}</version>
@ -2933,6 +2994,14 @@
                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                    <version>${carbon.device.mgt.version}</version>
                                </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                <feature>
                                    <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
                                    <version>${carbon.api.mgt.version}</version>
@ -3122,6 +3191,14 @@
                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                    <version>${carbon.device.mgt.version}</version>
                                </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                <feature>
                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
                                    <version>${carbon.device.mgt.version}</version>
@ -3523,6 +3600,14 @@
                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                    <version>${carbon.device.mgt.version}</version>
                                </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                <feature>
                                    <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
                                    <version>${carbon.api.mgt.version}</version>
--- a/modules/distribution/src/assembly/dist.xml
+++ b/modules/distribution/src/assembly/dist.xml
@ -45,14 +45,14 @@
                <include>*/**</include>
            </includes>
        </fileSet>
-        <fileSet>
-            <directory>src/resources/bin</directory>
-            <outputDirectory>wso2iot-${product.iot.version}/bin</outputDirectory>
-            <includes>
-                <include>*/**</include>
-            </includes>
-            <fileMode>755</fileMode>
-        </fileSet>
+        <!--<fileSet>-->
+            <!--<directory>src/resources/bin</directory>-->
+            <!--<outputDirectory>wso2iot-${product.iot.version}/bin</outputDirectory>-->
+            <!--<includes>-->
+                <!--<include>*/**</include>-->
+            <!--</includes>-->
+            <!--<fileMode>755</fileMode>-->
+        <!--</fileSet>-->
        <fileSet>
            <directory>src/resources/plugins</directory>
            <outputDirectory>wso2iot-${product.iot.version}/plugins</outputDirectory>
--- a/modules/distribution/src/resources/plugins/plugins-deployer.xml
+++ b/modules/distribution/src/resources/plugins/plugins-deployer.xml
@ -63,12 +63,6 @@
                                <featureArtifactDef>
                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:\${carbon.device.mgt.plugin.version}
                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:\${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:\${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
                            </featureArtifacts>
                        </configuration>
                    </execution>
@ -99,14 +93,6 @@
                                </feature>
                                <feature>
                                    <id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
-                                    <version>\${carbon.device.mgt.plugin.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
                                    <version>\${carbon.device.mgt.plugin.version}</version>
                                </feature>
                            </features>