removed unused components

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

@@ -117,7 +117,8 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c
 
             <!--All receiving events/messages will be in this ring buffer. Ring buffer size
             of MQTT inbound event disruptor. Default is set to 32768 (1024 * 32)
-            Having a large ring buffer will have a increase memory usage and will improve performance
+            Having a large ring buffer wi
+            ll have a increase memory usage and will improve performance
             and vise versa -->
             <inboundBufferSize>32768</inboundBufferSize>
 
@@ -171,13 +172,23 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c
                         inherit from org.dna.mqtt.moquette.server.IAutherizer
                         Note: default implementation authorizes against carbon permission with the topic.
                     -->
-                    <!--connectionPermission is required for a user to connect to broker-->
+                    <!--connectionPermission is required for a user to connect to broker
+                    subscriberPermission is needed to subscribe(subriber permission can be more than one)
+                    publisherPermission is needed to publish(publisher permission can be more than one)
+                    -->
                     <authorizer class="org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.DeviceAccessBasedMQTTAuthorizer">
-                        <property name="connectionPermission">/permission/admin/device-mgt/user</property>
-                        <property name="adminPermission">/permission/admin/device-mgt/admin</property>
-                        <property name="MQTTSubscriberScopeIdentifier">mqtt-subscriber</property>
-                        <property name="MQTTPublisherScopeIdentifier">mqtt-subscriber</property>
-                        <property name="devicemgtScopeIdentifier">device-mgt</property>
+						<!--<property name="connectionPermission">/permission/admin/device-mgt/user</property>-->
+                        <!--topic subscription permissions which are assigned through grouping-->
+                        <property name="subscriberPermission">/permission/device-mgt/user/groups/device_events</property>
+                        <!--topic publisher permissions which are assigned through grouping-->
+                        <property name="publisherPermission">/permission/device-mgt/user/groups/device_operation</property>
+
+                        <property name="username">admin</property>
+                        <property name="password">admin</property>
+                        <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>
                     </authorizer>
             </security>
         </mqtt>

modules/core/distribution/src/assembly/bin.xml

@@ -1176,15 +1176,6 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <!-- Copying remote-appmanager-config.xml -->
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/device-mgt-scopes.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
         <!-- Copying devi-appmanager-config.xml -->
         <file>
             <source>

modules/core/distribution/src/repository/conf/identity/identity.xml

@@ -149,16 +149,11 @@
                 <GrantTypeName>iwa:ntlm</GrantTypeName>
                 <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.iwa.ntlm.NTLMAuthenticationGrantHandler</GrantTypeHandlerImplClass>
             </SupportedGrantType>
-            <SupportedGrantType>
-                <GrantTypeName>urn:ietf:params:oauth:grant-type:jwt-bearer</GrantTypeName>
-                <GrantTypeHandlerImplClass>org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.ExtendedDeviceMgtJWTBearerGrantHandler</GrantTypeHandlerImplClass>
-                <GrantTypeValidatorImplClass>org.wso2.carbon.device.mgt.oauth.extensions.validators.ExtendedDeviceJWTGrantValidator</GrantTypeValidatorImplClass>
-            </SupportedGrantType>
-            <SupportedGrantType>
-                <GrantTypeName>device-mgt:password</GrantTypeName>
-                <GrantTypeHandlerImplClass>org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.ExtendedDeviceMgtPasswordGrantHandler</GrantTypeHandlerImplClass>
-                <GrantTypeValidatorImplClass>org.wso2.carbon.device.mgt.oauth.extensions.validators.ExtendedDevicePasswordGrantValidator</GrantTypeValidatorImplClass>
-            </SupportedGrantType>
+			<SupportedGrantType>
+				<GrantTypeName>urn:ietf:params:oauth:grant-type:jwt-bearer</GrantTypeName>
+				<GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.grant.jwt.JWTBearerGrantHandler</GrantTypeHandlerImplClass>
+				<GrantTypeValidatorImplClass>org.wso2.carbon.identity.oauth2.grant.jwt.JWTGrantValidator</GrantTypeValidatorImplClass>
+			</SupportedGrantType>
         </SupportedGrantTypes>
         <OAuthCallbackHandlers>
             <OAuthCallbackHandler Class="org.wso2.carbon.device.mgt.oauth.extensions.handlers.DeviceMgtOAuthCallbackHandler"/>