Merge branch 'fix-cdm-config-issue' into 'master'

Fix issue with package names

See merge request entgra/carbon-device-mgt!475
feature/appm-store/pbac
Saad Sahibjan 5 years ago
commit 6a97b38232

@ -31,10 +31,10 @@
<SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay> <SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay>
<SchedulerTaskEnabled>true</SchedulerTaskEnabled> <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
<PushNotificationProviders> <PushNotificationProviders>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
</PushNotificationProviders> </PushNotificationProviders>
</PushNotificationConfiguration> </PushNotificationConfiguration>
<PullNotificationConfiguration> <PullNotificationConfiguration>

@ -31,10 +31,10 @@
<SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay> <SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay>
<SchedulerTaskEnabled>true</SchedulerTaskEnabled> <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
<PushNotificationProviders> <PushNotificationProviders>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
</PushNotificationProviders> </PushNotificationProviders>
</PushNotificationConfiguration> </PushNotificationConfiguration>
<PullNotificationConfiguration> <PullNotificationConfiguration>

@ -31,10 +31,10 @@
<SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay> <SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay>
<SchedulerTaskEnabled>true</SchedulerTaskEnabled> <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
<PushNotificationProviders> <PushNotificationProviders>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
</PushNotificationProviders> </PushNotificationProviders>
</PushNotificationConfiguration> </PushNotificationConfiguration>
<PullNotificationConfiguration> <PullNotificationConfiguration>

@ -31,10 +31,10 @@
<SchedulerTaskInitialDelay>2000</SchedulerTaskInitialDelay> <SchedulerTaskInitialDelay>2000</SchedulerTaskInitialDelay>
<SchedulerTaskEnabled>true</SchedulerTaskEnabled> <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
<PushNotificationProviders> <PushNotificationProviders>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
</PushNotificationProviders> </PushNotificationProviders>
</PushNotificationConfiguration> </PushNotificationConfiguration>
<PullNotificationConfiguration> <PullNotificationConfiguration>

@ -31,10 +31,10 @@
<SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay> <SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay>
<SchedulerTaskEnabled>true</SchedulerTaskEnabled> <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
<PushNotificationProviders> <PushNotificationProviders>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
</PushNotificationProviders> </PushNotificationProviders>
</PushNotificationConfiguration> </PushNotificationConfiguration>
<PullNotificationConfiguration> <PullNotificationConfiguration>

@ -31,10 +31,10 @@
<SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay> <SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay>
<SchedulerTaskEnabled>true</SchedulerTaskEnabled> <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
<PushNotificationProviders> <PushNotificationProviders>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
</PushNotificationProviders> </PushNotificationProviders>
</PushNotificationConfiguration> </PushNotificationConfiguration>
<PullNotificationConfiguration> <PullNotificationConfiguration>

@ -31,10 +31,10 @@
<SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay> <SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay>
<SchedulerTaskEnabled>true</SchedulerTaskEnabled> <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
<PushNotificationProviders> <PushNotificationProviders>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
</PushNotificationProviders> </PushNotificationProviders>
</PushNotificationConfiguration> </PushNotificationConfiguration>
<PullNotificationConfiguration> <PullNotificationConfiguration>

@ -31,10 +31,10 @@
<SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay> <SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay>
<SchedulerTaskEnabled>true</SchedulerTaskEnabled> <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
<PushNotificationProviders> <PushNotificationProviders>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
<Provider>io.entgra.proprietary.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider> <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
</PushNotificationProviders> </PushNotificationProviders>
</PushNotificationConfiguration> </PushNotificationConfiguration>
<PullNotificationConfiguration> <PullNotificationConfiguration>

Loading…
Cancel
Save