android-plugin
org.wso2.carbon.devicemgt-plugins
-
4.2.7-SNAPSHOT
+
4.2.9-SNAPSHOT
../pom.xml
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java
index c3d0ac41d..5024dc799 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java
@@ -220,6 +220,12 @@ public class AndroidDeviceManager implements DeviceManager {
return true;
}
+ @Override
+ public boolean deleteDevice(DeviceIdentifier deviceId, Device device) throws DeviceManagementException {
+ //Returning false since AndroidDeviceManager is not used instead DeviceTypeManager is used.
+ return false;
+ }
+
@Override
public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
boolean isEnrolled = false;
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java
index 2494d1cd3..71ac1c031 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java
@@ -209,11 +209,19 @@ public class AndroidFeatureManager implements FeatureManager {
feature.setName("wifi");
feature.setDescription("Setting up wifi configuration");
supportedFeatures.add(feature);
+
feature = new Feature();
feature.setCode("CAMERA");
feature.setName("camera");
feature.setDescription("Enable or disable camera");
supportedFeatures.add(feature);
+
+ feature = new Feature();
+ feature.setCode("BACKUP_SERVICE");
+ feature.setName("Set Backup Service");
+ feature.setDescription("set backup service");
+ supportedFeatures.add(feature);
+
feature = new Feature();
feature.setCode("EMAIL");
feature.setName("Email");
diff --git a/components/mobile-plugins/android-plugin/pom.xml b/components/mobile-plugins/android-plugin/pom.xml
index 47f0b2874..28acee1f9 100644
--- a/components/mobile-plugins/android-plugin/pom.xml
+++ b/components/mobile-plugins/android-plugin/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt-plugins
mobile-plugins
- 4.2.7-SNAPSHOT
+ 4.2.9-SNAPSHOT
../pom.xml
diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml
index ac7d0ba7d..9f5890fde 100644
--- a/components/mobile-plugins/pom.xml
+++ b/components/mobile-plugins/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt-plugins
carbon-device-mgt-plugins-parent
- 4.2.7-SNAPSHOT
+ 4.2.9-SNAPSHOT
../../pom.xml
@@ -34,7 +34,6 @@
android-plugin
- windows-plugin
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
deleted file mode 100644
index 9fa78dec0..000000000
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
+++ /dev/null
@@ -1,407 +0,0 @@
-
-
-
-
-
- windows-plugin
- org.wso2.carbon.devicemgt-plugins
- 4.2.7-SNAPSHOT
- ../pom.xml
-
-
- 4.0.0
- org.wso2.carbon.device.mgt.mobile.windows.api
- WSO2 Carbon - Windows JAX-RS API
- Windows JAX-RS API
- war
-
-
-
-
- maven-compiler-plugin
-
- 1.8
- 1.8
-
- 2.3.2
-
-
- maven-war-plugin
- 2.2
-
-
- api#device-mgt#windows#v1.0
-
-
-
- org.jacoco
- jacoco-maven-plugin
-
- ${basedir}/target/coverage-reports/jacoco-unit.exec
-
-
-
- jacoco-initialize
-
- prepare-agent
-
-
-
- jacoco-site
- test
-
- report
-
-
- ${basedir}/target/coverage-reports/jacoco-unit.exec
- ${basedir}/target/coverage-reports/site
-
-
-
-
-
-
-
-
-
- deploy
-
- compile
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
- 1.7
-
-
- compile
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- client
-
- test
-
-
- org.codehaus.mojo
- exec-maven-plugin
- 1.2.1
-
-
- test
-
- java
-
-
-
-
-
-
-
-
-
-
-
-
- org.apache.cxf
- cxf-rt-frontend-jaxws
-
-
- org.apache.cxf
- cxf-rt-frontend-jaxrs
-
-
- org.apache.cxf
- cxf-rt-transports-http
-
-
- org.apache.cxf
- cxf-rt-bindings-soap
- compile
-
-
- org.apache.cxf
- cxf-rt-bindings-http
-
-
- org.slf4j
- slf4j-api
-
-
-
-
- org.apache.ws.security
- wss4j
-
-
- org.slf4j
- slf4j-api
-
-
- compile
-
-
- org.apache.cxf
- cxf-rt-rs-extension-providers
- compile
-
-
- org.apache.cxf
- cxf-rt-ws-security
-
-
- org.slf4j
- slf4j-api
-
-
-
-
- org.apache.wss4j
- wss4j-ws-security-common
-
-
- org.slf4j
- slf4j-api
-
-
-
-
- org.apache.ws.commons.axiom.wso2
- axiom
- provided
-
-
-
- log4j
- log4j
- provided
-
-
- org.springframework
- spring-web
-
-
-
- com.sun.xml.ws
- jaxws-rt
- provided
-
-
- com.sun.xml.messaging.saaj
- saaj-impl
-
-
- org.wso2.orbit.org.bouncycastle
- bcpkix-jdk15on
- provided
-
-
- org.wso2.orbit.org.bouncycastle
- bcprov-jdk15on
- provided
-
-
- org.codehaus.plexus
- plexus-utils
-
-
- com.madgag.spongycastle
- pkix
-
-
- com.madgag.spongycastle
- prov
-
-
- com.madgag.spongycastle
- core
-
-
- commons-codec
- commons-codec
-
-
- joda-time
- joda-time
-
-
- commons-io
- commons-io
- provided
-
-
- javax.ws.rs
- jsr311-api
-
-
- org.testng
- testng
-
-
- org.wso2.carbon
- org.wso2.carbon.logging
-
-
-
-
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.common
- provided
-
-
- org.wso2.carbon.devicemgt-plugins
- org.wso2.carbon.device.mgt.mobile.windows
- provided
-
-
- org.wso2.carbon.devicemgt
- org.wso2.carbon.webapp.authenticator.framework
- provided
-
-
- org.wso2.carbon.identity
- org.wso2.carbon.identity.base
-
-
- org.slf4j
- slf4j-api
-
-
-
-
- org.wso2.carbon.identity.inbound.auth.oauth2
- org.wso2.carbon.identity.oauth.stub
- provided
-
-
- org.wso2.carbon.identity.inbound.auth.oauth2
- org.wso2.carbon.identity.oauth
- provided
-
-
- org.slf4j
- slf4j-api
-
-
-
-
- javax.cache
- cache-api
- 0.5
- provided
-
-
- org.slf4j
- slf4j-api
-
-
-
-
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.core
- provided
-
-
- org.wso2.tomcat
- tomcat-servlet-api
- provided
-
-
- com.google.code.gson
- gson
- provided
-
-
- org.wso2.carbon.devicemgt
- org.wso2.carbon.policy.mgt.core
- provided
-
-
- org.wso2.carbon.devicemgt
- org.wso2.carbon.certificate.mgt.core
- provided
-
-
- org.wso2.carbon.devicemgt
- org.wso2.carbon.apimgt.annotations
- provided
-
-
- org.codehaus.jettison.wso2
- jettison
- 1.1.wso2v1
-
-
- org.json.wso2
- json
- 2.0.0.wso2v1
-
-
- io.swagger
- swagger-annotations
-
-
- io.swagger
- swagger-core
-
-
- org.slf4j
- slf4j-api
-
-
-
-
- io.swagger
- swagger-jaxrs
-
-
- org.slf4j
- slf4j-api
-
-
-
-
-
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/bean/EnterpriseApplication.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/bean/EnterpriseApplication.java
deleted file mode 100644
index 2d3a45b90..000000000
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/bean/EnterpriseApplication.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (c) 2019, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
- *
- * Entgra (Pvt) Ltd. 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.mobile.windows.api.bean;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.device.mgt.mobile.windows.api.common.PluginConstants;
-import org.wso2.carbon.device.mgt.mobile.windows.api.common.exceptions.SyncmlOperationException;
-import org.wso2.carbon.device.mgt.mobile.windows.api.common.exceptions.ProfileConfigurationException;
-import org.wso2.carbon.device.mgt.mobile.windows.api.operations.*;
-import org.wso2.carbon.device.mgt.mobile.windows.api.operations.util.Constants;
-import org.wso2.carbon.device.mgt.mobile.windows.api.operations.util.OperationCode;
-import org.wso2.carbon.device.mgt.mobile.windows.api.operations.util.SyncmlGenerator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@ApiModel(value = "EnterpriseApplication", description = "Information related to Enterprise Application.")
-public class EnterpriseApplication extends WindowsOperation {
-
- private static Log log = LogFactory.getLog(EnterpriseApplication.class);
-
- @ApiModelProperty(name = "packageURL", value = "Package URL.")
- private HostedAppxApplication hostedAppxApplication;
- @ApiModelProperty(name = "packageFamilyName", value = "Package family name.")
- private HostedMSIApplication hostedMSIApplication;
-
- public HostedAppxApplication getHostedAppxApplication() {
- return hostedAppxApplication;
- }
-
- public void setHostedAppxApplication(HostedAppxApplication hostedAppxApplication) {
- this.hostedAppxApplication = hostedAppxApplication;
- }
-
- public HostedMSIApplication getHostedMSIApplication() {
- return hostedMSIApplication;
- }
-
- public void setHostedMSIApplication(HostedMSIApplication hostedMSIApplication) {
- this.hostedMSIApplication = hostedMSIApplication;
- }
-
- public void validateRequest() throws ProfileConfigurationException {
- if (getHostedAppxApplication() != null) {
- if (isNullOrEmpty(getHostedAppxApplication().getpackageUri())) {
- throw new ProfileConfigurationException(
- "Appx package URL is not found for enterprise app installation");
- }
- if (isNullOrEmpty(getHostedAppxApplication().getpackageFamilyName())) {
- throw new ProfileConfigurationException(
- "Appx package Family Name is not found for enterprise app installation");
- }
- } else if (getHostedMSIApplication() != null) {
- if (isNullOrEmpty(getHostedMSIApplication().getProductId())) {
- throw new ProfileConfigurationException(
- "MSI product ID is not found for enterprise app installation");
- }
- if (isNullOrEmpty(getHostedMSIApplication().getContentUrl())) {
- throw new ProfileConfigurationException(
- "MSI product content download URL is not found for enterprise app installation");
- }
- if (isNullOrEmpty(getHostedMSIApplication().getFileHash())) {
- throw new ProfileConfigurationException(
- "MSI product file hash is not found for enterprise app installation");
- }
- } else {
- throw new ProfileConfigurationException("MSI or APPX payload is not found for enterprise app installation");
- }
- }
-
- @Override
- public List