diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
index 37dbaed8cd..7294bc0499 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
+++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
@@ -25,39 +25,128 @@
-
- 8
- 100
- 20
- 1000
-
+
+ 1000
+ 60000
+ 60000
+ true
+
+ 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.http.HTTPBasedPushNotificationProvider
+ org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider
+
+
+
+ false
+
https://localhost:9443
admin
admin
+
+ https://localhost:9443
+ admin
+ admin
+
- org.wso2.carbon.policy.mgt
- true
- 60000
- 5
- 8
- 20
-
+ org.wso2.carbon.policy.mgt
+ true
+ 60000
+ 5
+ 8
+ 20
+
+
+
Simple
true
-
+
+
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+
+
true
+
+
+ true
+ 600
+
+ 10000
+
true
86400
-
- true
- 300
-
+
+
+
+ jdbc/DM_ARCHIVAL_DS
+
+
+
+ false
+ org.wso2.carbon.device.mgt.core.task.impl.ArchivalTask
+
+ 0 0 0 1/1 * ? *
+
+ 30
+ 1000
+
+ false
+ org.wso2.carbon.device.mgt.core.task.impl.ArchivedDataDeletionTask
+
+ 0 0 3 1/1 * ? *
+
+ 365
+
+
+
+
+ false
+
+
+ false
+ false
+
+ false
+
+
+
+
+ *
+
+
+
+
+
+ true
+ wss://localhost:9443
+ 2
+ 100
+ 20
+ 15
+ 640
+
+ BYOD,COPE
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
index e81aa843cb..13cad9f6aa 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
@@ -170,7 +170,6 @@
org.wso2.carbon.devicemgt
org.wso2.carbon.device.mgt.analytics.data.publisher
- provided
org.slf4j
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
index 97e357a0e1..df57f65af4 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
@@ -17,11 +17,11 @@
*/
package org.wso2.carbon.device.mgt.core.config;
+import org.wso2.carbon.device.mgt.core.config.analytics.OperationAnalyticsConfiguration;
import org.wso2.carbon.device.mgt.core.config.archival.ArchivalConfiguration;
import org.wso2.carbon.device.mgt.core.config.cache.CertificateCacheConfiguration;
-import org.wso2.carbon.device.mgt.core.config.geo.location.GeoLocationConfiguration;
-import org.wso2.carbon.device.mgt.core.config.geo.location.OperationAnalyticsConfiguration;
import org.wso2.carbon.device.mgt.core.config.cache.DeviceCacheConfiguration;
+import org.wso2.carbon.device.mgt.core.config.geo.location.GeoLocationConfiguration;
import org.wso2.carbon.device.mgt.core.config.identity.IdentityConfigurations;
import org.wso2.carbon.device.mgt.core.config.keymanager.KeyManagerConfigurations;
import org.wso2.carbon.device.mgt.core.config.pagination.PaginationConfiguration;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/analytics/OperationAnalyticsConfiguration.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/analytics/OperationAnalyticsConfiguration.java
new file mode 100644
index 0000000000..bd3d0b1fc0
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/analytics/OperationAnalyticsConfiguration.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * you may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.device.mgt.core.config.analytics;
+
+import org.wso2.carbon.device.mgt.core.config.analytics.operation.OperationResponseConfigurations;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * This class represents the information related to Device Operation Analytics configuration.
+ */
+@XmlRootElement(name = "OperationAnalyticsConfiguration")
+public class OperationAnalyticsConfiguration {
+
+ private boolean isPublishDeviceInfoResponseEnabled;
+ private boolean isPublishLocationResponseEnabled;
+ private OperationResponseConfigurations operationResponseConfigurations;
+
+ public boolean isPublishDeviceInfoResponseEnabled() {
+ return isPublishDeviceInfoResponseEnabled;
+ }
+
+ @XmlElement(name = "PublishDeviceInfoResponse", required = true)
+ public void setPublishDeviceInfoResponseEnabled(boolean publishDeviceInfoResponseEnabled) {
+ this.isPublishDeviceInfoResponseEnabled = publishDeviceInfoResponseEnabled;
+ }
+
+ public boolean isPublishLocationResponseEnabled() {
+ return isPublishLocationResponseEnabled;
+ }
+
+ @XmlElement(name = "PublishLocationResponse", required = true)
+ public void setPublishLocationResponseEnabled(boolean publishLocationResponseEnabled) {
+ this.isPublishLocationResponseEnabled = publishLocationResponseEnabled;
+ }
+
+ public OperationResponseConfigurations getOperationResponseConfigurations() {
+ return operationResponseConfigurations;
+ }
+
+ @XmlElement(name = "PublishOperationResponse", required = true)
+ public void setOperationResponseConfigurations(
+ OperationResponseConfigurations operationResponseConfigurations) {
+ this.operationResponseConfigurations = operationResponseConfigurations;
+ }
+}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/analytics/operation/OperationResponseConfigurations.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/analytics/operation/OperationResponseConfigurations.java
new file mode 100644
index 0000000000..af09cbd930
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/analytics/operation/OperationResponseConfigurations.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * you may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.device.mgt.core.config.analytics.operation;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+
+/**
+ * This class represents the information related to Operation response configuration.
+ */
+@XmlRootElement(name = "PublishOperationResponse")
+public class OperationResponseConfigurations {
+
+ private boolean enabled;
+ private List operations;
+
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ @XmlElement(name = "Enabled", required = true)
+ public void setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ }
+
+ public List getOperations() {
+ return operations;
+ }
+
+ @XmlElementWrapper(name = "Operations", required = true)
+ @XmlElement(name = "Operation", required = true)
+ public void setOperations(List operations) {
+ this.operations = operations;
+ }
+}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/geo/location/OperationAnalyticsConfiguration.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/geo/location/OperationAnalyticsConfiguration.java
deleted file mode 100644
index 337a295fb4..0000000000
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/geo/location/OperationAnalyticsConfiguration.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * you may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.device.mgt.core.config.geo.location;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * This class represents the information related to Device Operation Analytics configuration.
- */
-@XmlRootElement(name = "OperationAnalyticsConfiguration")
-public class OperationAnalyticsConfiguration {
-
- private boolean publishDeviceInfoResponse;
- private boolean publishLocationResponse;
-
- public boolean getPublishDeviceInfoResponse() {
- return publishDeviceInfoResponse;
- }
-
- @XmlElement(name = "PublishDeviceInfoResponse", required = true)
- public void setPublishDeviceInfoResponse(boolean publishDeviceInfoResponse) {
- this.publishDeviceInfoResponse = publishDeviceInfoResponse;
- }
-
- public boolean getPublishLocationResponse() {
- return publishLocationResponse;
- }
-
- @XmlElement(name = "PublishLocationResponse", required = true)
- public void setPublishLocationResponse(boolean publishLocationResponse) {
- this.publishLocationResponse = publishLocationResponse;
- }
-}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
index 439448b382..cd82f01d2b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
@@ -23,6 +23,7 @@ import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.CarbonConstants;
import org.wso2.carbon.context.CarbonContext;
import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.device.mgt.analytics.data.publisher.exception.DataPublisherConfigurationException;
import org.wso2.carbon.device.mgt.common.Device;
import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
import org.wso2.carbon.device.mgt.common.DeviceManagementException;
@@ -87,6 +88,7 @@ import org.wso2.carbon.user.api.UserStoreException;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
@@ -100,6 +102,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
PluginInitializationListener {
private static Log log = LogFactory.getLog(DeviceManagementProviderServiceImpl.class);
+ private static final String OPERATION_RESPONSE_EVENT_STREAM_DEFINITION = "org.wso2.iot.OperationResponseStream";
private DeviceDAO deviceDAO;
private DeviceDetailsDAO deviceInfoDAO;
private DeviceTypeDAO deviceTypeDAO;
@@ -1447,6 +1450,34 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
public void updateOperation(DeviceIdentifier deviceId, Operation operation) throws OperationManagementException {
pluginRepository.getOperationManager(deviceId.getType(), this.getTenantId())
.updateOperation(deviceId, operation);
+ try {
+ if (DeviceManagerUtil.isPublishOperationResponseEnabled()) {
+ List permittedOperations = DeviceManagerUtil.getEnabledOperationsForResponsePublish();
+ if (permittedOperations.contains(operation.getCode())
+ || permittedOperations.contains("*")) {
+ Object[] metaData = {deviceId.getId(), deviceId.getType()};
+ Object[] payload = new Object[]{
+ Calendar.getInstance().getTimeInMillis(),
+ operation.getId(),
+ operation.getCode(),
+ operation.getType() != null ? operation.getType().toString() : null,
+ operation.getStatus() != null ? operation.getStatus().toString() : null,
+ operation.getOperationResponse()
+ };
+ DeviceManagerUtil.getEventPublisherService().publishEvent(
+ OPERATION_RESPONSE_EVENT_STREAM_DEFINITION, "1.0.0", metaData, new Object[0], payload
+ );
+ }
+ }
+ } catch (DeviceManagementException e) {
+ String msg = "Error occurred while reading configs.";
+ log.error(msg, e);
+ throw new OperationManagementException(msg, e);
+ } catch (DataPublisherConfigurationException e) {
+ String msg = "Error occurred while publishing event.";
+ log.error(msg, e);
+ throw new OperationManagementException(msg, e);
+ }
}
@Override
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
index 97cd4bfd37..cebb3141f0 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
@@ -419,7 +419,7 @@ public final class DeviceManagerUtil {
DeviceManagementConfig deviceManagementConfig = DeviceConfigurationManager.getInstance().
getDeviceManagementConfig();
if (deviceManagementConfig != null) {
- return deviceManagementConfig.getOperationAnalyticsConfiguration().getPublishLocationResponse();
+ return deviceManagementConfig.getOperationAnalyticsConfiguration().isPublishLocationResponseEnabled();
} else {
throw new DeviceManagementException("Device-Mgt configuration has not initialized. Please check the " +
"cdm-config.xml file.");
@@ -430,10 +430,34 @@ public final class DeviceManagerUtil {
DeviceManagementConfig deviceManagementConfig = DeviceConfigurationManager.getInstance().
getDeviceManagementConfig();
if (deviceManagementConfig != null) {
- return deviceManagementConfig.getOperationAnalyticsConfiguration().getPublishDeviceInfoResponse();
+ return deviceManagementConfig.getOperationAnalyticsConfiguration().isPublishDeviceInfoResponseEnabled();
} else {
throw new DeviceManagementException("Device-Mgt configuration has not initialized. Please check the " +
- "cdm-config.xml file.");
+ "cdm-config.xml file.");
+ }
+ }
+
+ public static boolean isPublishOperationResponseEnabled() throws DeviceManagementException {
+ DeviceManagementConfig deviceManagementConfig = DeviceConfigurationManager.getInstance().
+ getDeviceManagementConfig();
+ if (deviceManagementConfig != null) {
+ return deviceManagementConfig.getOperationAnalyticsConfiguration()
+ .getOperationResponseConfigurations().isEnabled();
+ } else {
+ throw new DeviceManagementException("Device-Mgt configuration has not initialized. Please check the " +
+ "cdm-config.xml file.");
+ }
+ }
+
+ public static List getEnabledOperationsForResponsePublish() throws DeviceManagementException {
+ DeviceManagementConfig deviceManagementConfig = DeviceConfigurationManager.getInstance().
+ getDeviceManagementConfig();
+ if (deviceManagementConfig != null) {
+ return deviceManagementConfig.getOperationAnalyticsConfiguration()
+ .getOperationResponseConfigurations().getOperations();
+ } else {
+ throw new DeviceManagementException("Device-Mgt configuration has not initialized. Please check the " +
+ "cdm-config.xml file.");
}
}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
index 4082f0ceec..731f2ade9c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
@@ -46,6 +46,11 @@
admin
admin
+
+ https://localhost:9443
+ admin
+ admin
+
org.wso2.carbon.policy.mgt
true
@@ -88,6 +93,31 @@
false
86400
+
+
+
+ jdbc/DM_ARCHIVAL_DS
+
+
+
+ false
+ org.wso2.carbon.device.mgt.core.task.impl.ArchivalTask
+
+ 0 0 0 1/1 * ? *
+
+ 30
+ 1000
+
+ false
+ org.wso2.carbon.device.mgt.core.task.impl.ArchivedDataDeletionTask
+
+ 0 0 3 1/1 * ? *
+
+ 365
+
+
+
false
@@ -107,6 +137,16 @@
+
+
+ true
+ wss://localhost:9443
+ 2
+ 100
+ 20
+ 15
+ 640
+
BYOD,COPE
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/operation/cdm-config.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/operation/cdm-config.xml
index 64b646890b..b425b57b9d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/operation/cdm-config.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/operation/cdm-config.xml
@@ -46,6 +46,11 @@
admin
admin
+
+ https://localhost:9443
+ admin
+ admin
+
org.wso2.carbon.policy.mgt
true
@@ -88,10 +93,60 @@
false
86400
+
+
+
+ jdbc/DM_ARCHIVAL_DS
+
+
+
+ false
+ org.wso2.carbon.device.mgt.core.task.impl.ArchivalTask
+
+ 0 0 0 1/1 * ? *
+
+ 30
+ 1000
+
+ false
+ org.wso2.carbon.device.mgt.core.task.impl.ArchivedDataDeletionTask
+
+ 0 0 3 1/1 * ? *
+
+ 365
+
+
+
- false
- false
+ false
+
+ false
+ false
+
+ false
+
+
+
+
+ *
+
+
+
+
+
+ true
+ wss://localhost:9443
+ 2
+ 100
+ 20
+ 15
+ 640
+
BYOD,COPE
diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/cdm-config.xml
index 9d3e282807..731f2ade9c 100644
--- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/cdm-config.xml
+++ b/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/cdm-config.xml
@@ -93,10 +93,51 @@
false
86400
+
+
+
+ jdbc/DM_ARCHIVAL_DS
+
+
+
+ false
+ org.wso2.carbon.device.mgt.core.task.impl.ArchivalTask
+
+ 0 0 0 1/1 * ? *
+
+ 30
+ 1000
+
+ false
+ org.wso2.carbon.device.mgt.core.task.impl.ArchivedDataDeletionTask
+
+ 0 0 3 1/1 * ? *
+
+ 365
+
+
+
- false
- false
+ false
+
+ false
+ false
+
+ false
+
+
+
+
+ *
+
+
+
+
true
wss://localhost:9443
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
index c84ae10bba..3755d4daf0 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
@@ -25,41 +25,128 @@
-
- 8
- 100
- 20
- 1000
-
+
+ 1000
+ 60000
+ 60000
+ true
+
+ 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.http.HTTPBasedPushNotificationProvider
+ org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider
+
+
+
+ false
+
https://localhost:9443
admin
admin
+
+ https://localhost:9443
+ admin
+ admin
+
- org.wso2.carbon.policy.mgt
- true
- 60000
- 5
- 8
- 20
-
+ org.wso2.carbon.policy.mgt
+ true
+ 60000
+ 5
+ 8
+ 20
+
+
+
Simple
true
-
+
+
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+
+
true
+
true
- 300
+ 600
+
+ 10000
-
- 100
- 2000
- 10
- false
-
+
+ true
+ 86400
+
+
+
+
+ jdbc/DM_ARCHIVAL_DS
+
+
+
+ false
+ org.wso2.carbon.device.mgt.core.task.impl.ArchivalTask
+
+ 0 0 0 1/1 * ? *
+
+ 30
+ 1000
+
+ false
+ org.wso2.carbon.device.mgt.core.task.impl.ArchivedDataDeletionTask
+
+ 0 0 3 1/1 * ? *
+
+ 365
+
+
+
+
+ false
+
+
+ false
+ false
+
+ false
+
+
+
+
+ *
+
+
+
+
+
+ true
+ wss://localhost:9443
+ 2
+ 100
+ 20
+ 15
+ 640
+
+ BYOD,COPE
diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/resources/carbon-home/repository/conf/cdm-config.xml
index ea0f23c08e..aa02b0612a 100644
--- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/resources/carbon-home/repository/conf/cdm-config.xml
+++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/resources/carbon-home/repository/conf/cdm-config.xml
@@ -46,6 +46,11 @@
admin
admin
+
+ https://localhost:9443
+ admin
+ admin
+
org.wso2.carbon.policy.mgt
true
@@ -88,11 +93,6 @@
false
86400
-
- false
- false
-
- BYOD,COPE
@@ -112,11 +112,41 @@
org.wso2.carbon.device.mgt.core.task.impl.ArchivedDataDeletionTask
0 0 3 1/1 * ? *
-
365
+
+ false
+
+
+ false
+ false
+
+ false
+
+
+
+
+ *
+
+
+
+
+
+ true
+ wss://localhost:9443
+ 2
+ 100
+ 20
+ 15
+ 640
+
+ BYOD,COPE