diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/pom.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml
similarity index 95%
rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/pom.xml
rename to components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml
index 29817d34072..b4014d144d9 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/pom.xml
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml
@@ -27,10 +27,10 @@
4.0.0
- org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm
+ org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm
bundle
- WSO2 Carbon - GCM Based Push Notification Provider Implementation
- WSO2 Carbon - GCM Based Push Notification Provider Implementation
+ WSO2 Carbon - FCM Based Push Notification Provider Implementation
+ WSO2 Carbon - FCM Based Push Notification Provider Implementation
http://wso2.org
@@ -128,10 +128,10 @@
${project.artifactId}
${project.artifactId}
${carbon.device.mgt.version}
- GCM Based Push Notification Provider Bundle
+ FCM Based Push Notification Provider Bundle
- !org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.internal,
- org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.*
+ !org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal,
+ org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.*
com.google.gson,
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/gcm/GCMBasedPushNotificationProvider.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMBasedPushNotificationProvider.java
similarity index 84%
rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/gcm/GCMBasedPushNotificationProvider.java
rename to components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMBasedPushNotificationProvider.java
index 5168e25e258..30affceb278 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/gcm/GCMBasedPushNotificationProvider.java
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMBasedPushNotificationProvider.java
@@ -16,24 +16,24 @@
* under the License.
*
*/
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm;
+package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm;
import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationProvider;
-public class GCMBasedPushNotificationProvider implements PushNotificationProvider {
+public class FCMBasedPushNotificationProvider implements PushNotificationProvider {
- private static final String PS_PROVIDER_GCM = "GCM";
+ private static final String PS_PROVIDER_FCM = "FCM";
@Override
public String getType() {
- return PS_PROVIDER_GCM;
+ return PS_PROVIDER_FCM;
}
@Override
public NotificationStrategy getNotificationStrategy(PushNotificationConfig config) {
- return new GCMNotificationStrategy(config);
+ return new FCMNotificationStrategy(config);
}
}
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/gcm/GCMNotificationStrategy.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMNotificationStrategy.java
similarity index 76%
rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/gcm/GCMNotificationStrategy.java
rename to components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMNotificationStrategy.java
index f894e182499..6dd66f08367 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/gcm/GCMNotificationStrategy.java
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMNotificationStrategy.java
@@ -16,7 +16,7 @@
* under the License.
*
*/
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm;
+package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
@@ -27,7 +27,7 @@ import org.wso2.carbon.device.mgt.common.push.notification.NotificationContext;
import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException;
-import org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.internal.GCMDataHolder;
+import org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal.FCMDataHolder;
import java.io.IOException;
import java.io.OutputStream;
@@ -35,16 +35,16 @@ import java.net.HttpURLConnection;
import java.net.URL;
import java.util.List;
-public class GCMNotificationStrategy implements NotificationStrategy {
+public class FCMNotificationStrategy implements NotificationStrategy {
- private static final String GCM_TOKEN = "GCM_TOKEN";
- private static final String GCM_ENDPOINT = "https://fcm.googleapis.com/fcm/send";
- private static final String GCM_API_KEY = "gcmAPIKey";
+ private static final String FCM_TOKEN = "FCM_TOKEN";
+ private static final String FCM_ENDPOINT = "https://fcm.googleapis.com/fcm/send";
+ private static final String FCM_API_KEY = "fcmAPIKey";
private static final int TIME_TO_LIVE = 60;
private static final int HTTP_STATUS_CODE_OK = 200;
private PushNotificationConfig config;
- public GCMNotificationStrategy(PushNotificationConfig config) {
+ public FCMNotificationStrategy(PushNotificationConfig config) {
this.config = config;
}
@@ -57,7 +57,7 @@ public class GCMNotificationStrategy implements NotificationStrategy {
public void execute(NotificationContext ctx) throws PushNotificationExecutionFailedException {
try {
Device device =
- GCMDataHolder.getInstance().getDeviceManagementProviderService().getDevice(ctx.getDeviceId());
+ FCMDataHolder.getInstance().getDeviceManagementProviderService().getDevice(ctx.getDeviceId());
this.sendWakeUpCall(ctx.getOperation().getCode(), device);
} catch (DeviceManagementException e) {
throw new PushNotificationExecutionFailedException("Error occurred while retrieving device information", e);
@@ -79,13 +79,13 @@ public class GCMNotificationStrategy implements NotificationStrategy {
private void sendWakeUpCall(String message,
Device device) throws IOException, PushNotificationExecutionFailedException {
OutputStream os = null;
- byte[] bytes = getGCMRequest(message, getGCMToken(device.getProperties())).getBytes();
+ byte[] bytes = getFCMRequest(message, getFCMToken(device.getProperties())).getBytes();
HttpURLConnection conn = null;
try {
- conn = (HttpURLConnection) new URL(GCM_ENDPOINT).openConnection();
+ conn = (HttpURLConnection) new URL(FCM_ENDPOINT).openConnection();
conn.setRequestProperty("Content-Type", "application/json");
- conn.setRequestProperty("Authorization", "key=" + config.getProperty(GCM_API_KEY));
+ conn.setRequestProperty("Authorization", "key=" + config.getProperty(FCM_API_KEY));
conn.setRequestMethod("POST");
conn.setDoOutput(true);
os = conn.getOutputStream();
@@ -102,35 +102,35 @@ public class GCMNotificationStrategy implements NotificationStrategy {
}
}
- private static String getGCMRequest(String message, String registrationId) {
- JsonObject gcmRequest = new JsonObject();
- gcmRequest.addProperty("delay_while_idle", false);
- gcmRequest.addProperty("time_to_live", TIME_TO_LIVE);
+ private static String getFCMRequest(String message, String registrationId) {
+ JsonObject fcmRequest = new JsonObject();
+ fcmRequest.addProperty("delay_while_idle", false);
+ fcmRequest.addProperty("time_to_live", TIME_TO_LIVE);
- //Add message to GCM request
+ //Add message to FCM request
JsonObject data = new JsonObject();
if (message != null && !message.isEmpty()) {
data.addProperty("data", message);
- gcmRequest.add("data", data);
+ fcmRequest.add("data", data);
}
//Set device reg-id
JsonArray regIds = new JsonArray();
regIds.add(new JsonPrimitive(registrationId));
- gcmRequest.add("registration_ids", regIds);
- return gcmRequest.toString();
+ fcmRequest.add("registration_ids", regIds);
+ return fcmRequest.toString();
}
- private static String getGCMToken(List properties) {
- String gcmToken = null;
+ private static String getFCMToken(List properties) {
+ String fcmToken = null;
for (Device.Property property : properties) {
- if (GCM_TOKEN.equals(property.getName())) {
- gcmToken = property.getValue();
+ if (FCM_TOKEN.equals(property.getName())) {
+ fcmToken = property.getValue();
break;
}
}
- return gcmToken;
+ return fcmToken;
}
}
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/gcm/internal/GCMDataHolder.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMDataHolder.java
similarity index 88%
rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/gcm/internal/GCMDataHolder.java
rename to components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMDataHolder.java
index 67b44109afd..64569d7fb6c 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/gcm/internal/GCMDataHolder.java
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMDataHolder.java
@@ -16,16 +16,16 @@
* under the License.
*
*/
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.internal;
+package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal;
import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
-public class GCMDataHolder {
+public class FCMDataHolder {
private DeviceManagementProviderService deviceManagementProviderService;
- private static GCMDataHolder thisInstance = new GCMDataHolder();
+ private static FCMDataHolder thisInstance = new FCMDataHolder();
- public static GCMDataHolder getInstance() {
+ public static FCMDataHolder getInstance() {
return thisInstance;
}
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/gcm/internal/GCMPushNotificationServiceComponent.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java
similarity index 81%
rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/gcm/internal/GCMPushNotificationServiceComponent.java
rename to components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java
index 6e5171ec4be..3aa753c96e8 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/gcm/internal/GCMPushNotificationServiceComponent.java
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java
@@ -16,7 +16,7 @@
* under the License.
*
*/
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.internal;
+package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -24,7 +24,7 @@ import org.osgi.service.component.ComponentContext;
import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
/**
- * @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.internal.GCMPushNotificationServiceComponent" immediate="true"
+ * @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal.FCMPushNotificationServiceComponent" immediate="true"
* @scr.reference name="carbon.device.mgt.provider"
* interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService"
* cardinality="1..1"
@@ -32,23 +32,23 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
* bind="setDeviceManagementProviderService"
* unbind="unsetDeviceManagementProviderService"
*/
-public class GCMPushNotificationServiceComponent {
+public class FCMPushNotificationServiceComponent {
- private static final Log log = LogFactory.getLog(GCMPushNotificationServiceComponent.class);
+ private static final Log log = LogFactory.getLog(FCMPushNotificationServiceComponent.class);
@SuppressWarnings("unused")
protected void activate(ComponentContext componentContext) {
try {
if (log.isDebugEnabled()) {
- log.debug("Initializing GCM based push notification provider implementation bundle");
+ log.debug("Initializing FCM based push notification provider implementation bundle");
}
//Do nothing
if (log.isDebugEnabled()) {
- log.debug("GCM based push notification provider implementation bundle has been successfully " +
+ log.debug("FCM based push notification provider implementation bundle has been successfully " +
"initialized");
}
} catch (Throwable e) {
- log.error("Error occurred while initializing GCM based push notification provider " +
+ log.error("Error occurred while initializing FCM based push notification provider " +
"implementation bundle", e);
}
}
@@ -59,12 +59,12 @@ public class GCMPushNotificationServiceComponent {
protected void setDeviceManagementProviderService(
DeviceManagementProviderService deviceManagementProviderService) {
- GCMDataHolder.getInstance().setDeviceManagementProviderService(deviceManagementProviderService);
+ FCMDataHolder.getInstance().setDeviceManagementProviderService(deviceManagementProviderService);
}
protected void unsetDeviceManagementProviderService(
DeviceManagementProviderService deviceManagementProviderService) {
- GCMDataHolder.getInstance().setDeviceManagementProviderService(deviceManagementProviderService);
+ FCMDataHolder.getInstance().setDeviceManagementProviderService(deviceManagementProviderService);
}
}
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPPushNotificationServiceComponent.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPPushNotificationServiceComponent.java
index 7085191dc84..71dada3b663 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPPushNotificationServiceComponent.java
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPPushNotificationServiceComponent.java
@@ -25,7 +25,7 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService;
/**
- * @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.internal.XMPPPushNotificationServiceComponent" immediate="true"
+ * @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal.XMPPPushNotificationServiceComponent" immediate="true"
* @scr.reference name="carbon.device.mgt.provider"
* interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService"
* cardinality="1..1"
diff --git a/components/device-mgt-extensions/pom.xml b/components/device-mgt-extensions/pom.xml
index a314ce8337d..7e8f0366df7 100644
--- a/components/device-mgt-extensions/pom.xml
+++ b/components/device-mgt-extensions/pom.xml
@@ -34,7 +34,7 @@
http://wso2.org
- org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm
+ org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm
org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt
org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp
org.wso2.carbon.device.mgt.extensions.device.type.deployer
diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
similarity index 94%
rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/pom.xml
rename to features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
index 72b970f8a43..da4271ef86e 100644
--- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/pom.xml
+++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
@@ -27,17 +27,17 @@
4.0.0
- org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature
+ org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature
pom
2.0.24-SNAPSHOT
- WSO2 Carbon - GCM Based Push Notification Provider Feature
+ WSO2 Carbon - FCM Based Push Notification Provider Feature
http://wso2.org
WSO2 Carbon - MQTT Based Push Notification Provider Feature
org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm
+ org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm
@@ -80,7 +80,7 @@
p2-feature-gen
- org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm
+ org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm
../../../features/etc/feature.properties
@@ -90,7 +90,7 @@
- org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm:${carbon.device.mgt.version}
+ org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm:${carbon.device.mgt.version}
diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/src/main/resources/build.properties b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/src/main/resources/build.properties
similarity index 100%
rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/src/main/resources/build.properties
rename to features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/src/main/resources/build.properties
diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/src/main/resources/p2.inf b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/src/main/resources/p2.inf
similarity index 100%
rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/src/main/resources/p2.inf
rename to features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/src/main/resources/p2.inf
diff --git a/features/device-mgt-extensions/pom.xml b/features/device-mgt-extensions/pom.xml
index e90f61932dc..9cee08ceeae 100644
--- a/features/device-mgt-extensions/pom.xml
+++ b/features/device-mgt-extensions/pom.xml
@@ -34,7 +34,7 @@
org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature
- org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature
+ org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature
org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature
org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
index c747b4354c6..42a0372076a 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
@@ -26,7 +26,7 @@
- org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.GCMBasedPushNotificationProvider
+ org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider
org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider
org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider
diff --git a/pom.xml b/pom.xml
index e6c6416d18a..6f42ff9fac1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1403,7 +1403,7 @@
org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm
+ org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm
${carbon.device.mgt.version}