metaData) {
this.metaData = metaData;
}
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Features.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Features.java
index 1904cac3ed..bd2fec5cae 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Features.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Features.java
@@ -32,15 +32,15 @@ import java.util.List;
* The following schema fragment specifies the expected content contained within this class.
*
*
- * <complexType name="Features">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="Feature" type="{}Feature"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
*
*
*
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Filter.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Filter.java
new file mode 100644
index 0000000000..5262a1ae34
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Filter.java
@@ -0,0 +1,76 @@
+/*
+ * 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.extensions.device.type.template.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+
+/**
+ * Java class for filter complex type.
+ *
+ * The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+public class Filter {
+ @XmlElement(name = "property", required = true)
+ private String property;
+
+ @XmlElement(name = "value", required = true)
+ private String value;
+
+ @XmlElement(name = "description", required = true)
+ private String description;
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/FormParameters.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/FormParameters.java
index 3cacabb3e4..d0bd140672 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/FormParameters.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/FormParameters.java
@@ -14,7 +14,24 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
+ */
+
+/*
+ * 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.extensions.device.type.template.config;
@@ -27,26 +44,24 @@ import java.util.List;
/**
- * Java class for FormParameters complex type.
+ *
Java class for fromParams complex type.
*
*
The following schema fragment specifies the expected content contained within this class.
*
*
- * <complexType name="FormParameters">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="Parameter" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
*
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FormParameters", propOrder = {
+@XmlType(name = "formParams", propOrder = {
"parameter"
})
public class FormParameters {
@@ -56,7 +71,7 @@ public class FormParameters {
public List getParameter() {
if (parameter == null) {
- parameter = new ArrayList();
+ parameter = new ArrayList<>();
}
return this.parameter;
}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Operation.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Operation.java
index 06fe5cf1be..74366da00c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Operation.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Operation.java
@@ -14,8 +14,26 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
+ */
+
+/*
+ * 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.extensions.device.type.template.config;
import javax.xml.bind.annotation.XmlAccessType;
@@ -26,164 +44,71 @@ import javax.xml.bind.annotation.XmlType;
/**
- * Java class for Operation complex type.
- *
- *
The following schema fragment specifies the expected content contained within this class.
- *
+ * Java class for Operation complex type.
+ *
+ * The following schema fragment specifies the expected content contained within this class.
+ *
*
- * <complexType name="Operation">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="QueryParameters" type="{}QueryParameters"/>
- * <element name="FormParameters" type="{}FormParameters"/>
- * </sequence>
- * <attribute name="context" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="method" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
- * </restriction>
- * </complexContent>
- * </complexType>
+ *
+ *
+ *
+ *
+ *
+ *
*
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "Operation", propOrder = {
- "queryParameters",
- "formParameters"
+ "params",
+ "metadata"
})
public class Operation {
- @XmlElement(name = "QueryParameters")
- protected QueryParameters queryParameters;
- @XmlElement(name = "FormParameters")
- protected FormParameters formParameters;
- @XmlAttribute(name = "context")
- protected String context;
- @XmlAttribute(name = "method")
- protected String method;
- @XmlAttribute(name = "type")
- protected String type;
-
- /**
- * Gets the value of the Content Type property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getType() {
- return type;
- }
+ @XmlElement(name = "params")
+ private Params params;
- /**
- * Sets the value of the Content Type property.
- *
- * @param type
- * allowed object is
- * {@link String }
- *
- */
- public void setType(String type) {
- this.type = type;
- }
+ @XmlElement(name = "metadata", required = true)
+ private OperationMetadata metadata;
- /**
- * Gets the value of the queryParameters property.
- *
- * @return
- * possible object is
- * {@link QueryParameters }
- *
- */
- public QueryParameters getQueryParameters() {
- return queryParameters;
- }
+ @XmlAttribute(name = "hidden", required = true)
+ private boolean hidden;
+
+ @XmlAttribute(name = "icon")
+ private String icon;
- /**
- * Sets the value of the queryParameters property.
- *
- * @param value
- * allowed object is
- * {@link QueryParameters }
- *
- */
- public void setQueryParameters(QueryParameters value) {
- this.queryParameters = value;
+ public Params getParams() {
+ return params;
}
- /**
- * Gets the value of the formParameters property.
- *
- * @return
- * possible object is
- * {@link FormParameters }
- *
- */
- public FormParameters getFormParameters() {
- return formParameters;
+ public void setParams(Params params) {
+ this.params = params;
}
- /**
- * Sets the value of the formParameters property.
- *
- * @param value
- * allowed object is
- * {@link FormParameters }
- *
- */
- public void setFormParameters(FormParameters value) {
- this.formParameters = value;
+ public OperationMetadata getMetadata() {
+ return metadata;
}
- /**
- * Gets the value of the context property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getContext() {
- return context;
+ public void setMetadata(OperationMetadata metadata) {
+ this.metadata = metadata;
}
- /**
- * Sets the value of the context property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setContext(String value) {
- this.context = value;
+ public String getIcon() {
+ return icon;
}
- /**
- * Gets the value of the method property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMethod() {
- return method;
+ public void setIcon(String icon) {
+ this.icon = icon;
}
- /**
- * Sets the value of the method property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setMethod(String value) {
- this.method = value;
+ public boolean isHidden() {
+ return hidden;
}
+ public void setHidden(boolean hidden) {
+ this.hidden = hidden;
+ }
}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/OperationMetadata.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/OperationMetadata.java
new file mode 100644
index 0000000000..81a4139d8e
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/OperationMetadata.java
@@ -0,0 +1,120 @@
+/*
+ * 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.extensions.device.type.template.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlType;
+import java.util.List;
+
+/**
+ * Java class for metadata complex type.
+ *
+ * The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "metadata", propOrder = {
+ "uri",
+ "method",
+ "contentType",
+ "permission",
+ "filterList"
+})
+public class OperationMetadata {
+
+ @XmlElement(name = "uri", required = true)
+ private String uri;
+
+ @XmlElement(name = "method", required = true)
+ private String method;
+
+ @XmlElement(name = "contentType")
+ private String contentType;
+
+ @XmlElement(name = "permission")
+ private String permission;
+
+ @XmlElementWrapper(name = "filters")
+ @XmlElement(name = "filter")
+ private List filterList;
+
+ public String getUri() {
+ return uri;
+ }
+
+ public void setUri(String uri) {
+ this.uri = uri;
+ }
+
+ public String getMethod() {
+ return method;
+ }
+
+ public void setMethod(String method) {
+ this.method = method;
+ }
+
+ public String getContentType() {
+ return contentType;
+ }
+
+ public void setContentType(String contentType) {
+ this.contentType = contentType;
+ }
+
+ public String getPermission() {
+ return permission;
+ }
+
+ public void setPermission(String permission) {
+ this.permission = permission;
+ }
+
+ public List getFilterList() {
+ return filterList;
+ }
+
+ public void setFilters(List filterList) {
+ this.filterList = filterList;
+ }
+}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Params.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Params.java
new file mode 100644
index 0000000000..ad9f5b97bc
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Params.java
@@ -0,0 +1,78 @@
+/*
+ * 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.extensions.device.type.template.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Java class for params complex type.
+ *
+ * The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "params")
+public class Params {
+
+ @XmlElement(name = "queryParams")
+ private QueryParameters queryParameters;
+
+ @XmlElement(name = "formParams")
+ private FormParameters formParameters;
+
+ @XmlElement(name = "uiParams")
+ private UIParameters uiParameters;
+
+ public QueryParameters getQueryParameters() {
+ return queryParameters;
+ }
+
+ public void setQueryParameters(QueryParameters queryParameters) {
+ this.queryParameters = queryParameters;
+ }
+
+ public FormParameters getFormParameters() {
+ return formParameters;
+ }
+
+ public void setFormParameters(FormParameters formParameters) {
+ this.formParameters = formParameters;
+ }
+
+ public UIParameters getUiParameters() {
+ return uiParameters;
+ }
+
+ public void setUiParameters(UIParameters uiParameters) {
+ this.uiParameters = uiParameters;
+ }
+}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/QueryParameters.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/QueryParameters.java
index e79826134e..69c8fd15af 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/QueryParameters.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/QueryParameters.java
@@ -14,8 +14,26 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
+ */
+
+/*
+ * 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.extensions.device.type.template.config;
import javax.xml.bind.annotation.XmlAccessType;
@@ -27,26 +45,24 @@ import java.util.List;
/**
- * Java class for QueryParameters complex type.
+ * Java class for queryParams complex type.
*
- *
The following schema fragment specifies the expected content contained within this class.
+ * The following schema fragment specifies the expected content contained within this class.
*
*
- * <complexType name="QueryParameters">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="Parameter" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
*
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "QueryParameters", propOrder = {
+@XmlType(name = "queryParams", propOrder = {
"parameter"
})
public class QueryParameters {
@@ -56,7 +72,7 @@ public class QueryParameters {
public List getParameter() {
if (parameter == null) {
- parameter = new ArrayList();
+ parameter = new ArrayList<>();
}
return this.parameter;
}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/UIParameter.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/UIParameter.java
new file mode 100644
index 0000000000..91db1932b3
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/UIParameter.java
@@ -0,0 +1,134 @@
+/*
+ * 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.extensions.device.type.template.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import java.util.List;
+
+/**
+ * Java class for uiParams complex type.
+ *
+ * The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+public class UIParameter {
+
+ @XmlElement(name = "id", required = true)
+ protected String id;
+
+ @XmlAttribute(name = "optional", required = true)
+ private boolean optional;
+
+ @XmlElement(name = "type", required = true)
+ protected String type;
+
+ @XmlElement(name = "name")
+ protected String name;
+
+ @XmlElement(name = "label")
+ private String label;
+
+ @XmlElement(name = "helper")
+ private String helper;
+
+ @XmlElementWrapper(name = "values")
+ @XmlElement(name = "value")
+ protected List value;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(String label) {
+ this.label = label;
+ }
+
+ public String getHelper() {
+ return helper;
+ }
+
+ public void setHelper(String helper) {
+ this.helper = helper;
+ }
+
+ public List getValue() {
+ return value;
+ }
+
+ public void setValue(List value) {
+ this.value = value;
+ }
+
+ public boolean isOptional() {
+ return optional;
+ }
+
+ public void setOptional(boolean optional) {
+ this.optional = optional;
+ }
+}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/UIParameters.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/UIParameters.java
new file mode 100644
index 0000000000..35ad1689e7
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/UIParameters.java
@@ -0,0 +1,48 @@
+/*
+ * 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.extensions.device.type.template.config;
+
+import javax.xml.bind.annotation.XmlElement;
+import java.util.List;
+
+/**
+ * Java class for uiParams complex type.
+ *
+ * The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+public class UIParameters {
+
+ @XmlElement(name = "uiParam")
+ private List uiParams;
+
+ public List getUiParameterList() {
+ return this.uiParams;
+ }
+}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/feature/ConfigurationBasedFeatureManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/feature/ConfigurationBasedFeatureManager.java
index 9d9b038168..1043628369 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/feature/ConfigurationBasedFeatureManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/feature/ConfigurationBasedFeatureManager.java
@@ -16,12 +16,35 @@
* under the License.
*
*/
+
+/*
+ * 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.extensions.device.type.template.feature;
import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import org.apache.commons.lang.StringUtils;
import org.wso2.carbon.device.mgt.common.Feature;
import org.wso2.carbon.device.mgt.common.FeatureManager;
import org.wso2.carbon.device.mgt.extensions.device.type.template.config.Operation;
+import org.wso2.carbon.device.mgt.extensions.device.type.template.config.OperationMetadata;
+import org.wso2.carbon.device.mgt.extensions.device.type.template.config.Params;
+import org.wso2.carbon.device.mgt.extensions.device.type.template.config.UIParameter;
import java.util.ArrayList;
import java.util.HashMap;
@@ -37,10 +60,15 @@ public class ConfigurationBasedFeatureManager implements FeatureManager {
private List features = new ArrayList<>();
private static final String METHOD = "method";
private static final String URI = "uri";
+ private static final String OPERATION_META = "operationMeta";
private static final String CONTENT_TYPE = "contentType";
+ private static final String PERMISSION = "permission";
+ private static final String ICON = "icon";
+ private static final String FILTERS = "filters";
private static final String PATH_PARAMS = "pathParams";
private static final String QUERY_PARAMS = "queryParams";
private static final String FORM_PARAMS = "formParams";
+ private static final String UI_PARAMS = "uiParams";
private static final Pattern PATH_PARAM_REGEX = Pattern.compile("\\{(.*?)\\}");
public ConfigurationBasedFeatureManager(
@@ -50,6 +78,7 @@ public class ConfigurationBasedFeatureManager implements FeatureManager {
deviceFeature.setCode(feature.getCode());
deviceFeature.setName(feature.getName());
deviceFeature.setDescription(feature.getDescription());
+ deviceFeature.setType(feature.getType());
Operation operation = feature.getOperation();
List metadataEntries = null;
if (feature.getMetaData() != null) {
@@ -64,31 +93,53 @@ public class ConfigurationBasedFeatureManager implements FeatureManager {
}
}
if (operation != null) {
- Map apiParams = new HashMap<>();
- apiParams.put(METHOD, operation.getMethod().toUpperCase());
- apiParams.put(URI, operation.getContext());
- apiParams.put(CONTENT_TYPE, operation.getType());
+ deviceFeature.setHidden(operation.isHidden());
+ Map operationMeta = new HashMap<>();
+ OperationMetadata metadata = operation.getMetadata();
+
List pathParams = new ArrayList<>();
- List queryParams = new ArrayList<>();
- List formParams = new ArrayList<>();
- setPathParams(operation.getContext(), pathParams);
- apiParams.put(PATH_PARAMS, pathParams);
- if (operation.getQueryParameters() != null) {
- queryParams = operation.getQueryParameters().getParameter();
+
+ if (metadata != null) {
+ operationMeta.put(METHOD, metadata.getMethod().toUpperCase());
+ operationMeta.put(URI, metadata.getUri());
+ if (StringUtils.isNotEmpty(metadata.getContentType())) {
+ operationMeta.put(CONTENT_TYPE, metadata.getContentType());
+ }
+ if (StringUtils.isNotEmpty(metadata.getPermission())) {
+ operationMeta.put(PERMISSION, metadata.getPermission());
+ }
+ if (metadata.getFilterList() != null && metadata.getFilterList().size() > 0) {
+ operationMeta.put(FILTERS, metadata.getFilterList());
+ }
+ operationMeta.put(ICON, operation.getIcon());
+ setPathParams(metadata.getUri(), pathParams);
}
- apiParams.put(QUERY_PARAMS, queryParams);
- if (operation.getFormParameters() != null) {
- formParams = operation.getFormParameters().getParameter();
+ operationMeta.put(PATH_PARAMS, pathParams);
+
+ Params params = operation.getParams();
+ if (params != null) {
+ List queryParams = params.getQueryParameters() != null ?
+ params.getQueryParameters().getParameter() : new ArrayList<>();
+ List formParams = params.getFormParameters() != null ?
+ params.getFormParameters().getParameter() : new ArrayList<>();
+ List uiParams = params.getUiParameters() != null ?
+ params.getUiParameters().getUiParameterList() : new ArrayList<>();
+ operationMeta.put(QUERY_PARAMS, queryParams);
+ operationMeta.put(UI_PARAMS, uiParams);
+ operationMeta.put(FORM_PARAMS, formParams);
}
- apiParams.put(FORM_PARAMS, formParams);
+
if (metadataEntries == null) {
metadataEntries = new ArrayList<>();
}
Feature.MetadataEntry metadataEntry = new Feature.MetadataEntry();
- metadataEntry.setId(-1);
- metadataEntry.setValue(apiParams);
+ metadataEntry.setId(0);
+ metadataEntry.setName(OPERATION_META);
+ metadataEntry.setValue(operationMeta);
metadataEntries.add(metadataEntry);
deviceFeature.setMetadataEntries(metadataEntries);
+ } else {
+ deviceFeature.setHidden(true);
}
this.features.add(deviceFeature);
}
@@ -120,6 +171,49 @@ public class ConfigurationBasedFeatureManager implements FeatureManager {
return features;
}
+ @Override
+ public List getFeatures(String type) throws DeviceManagementException {
+ if (StringUtils.isEmpty(type)) {
+ return this.getFeatures();
+ }
+
+ if (features == null) {
+ return null;
+ } else {
+ List filteredFeatures = new ArrayList<>();
+ for (Feature feature : this.getFeatures()) {
+ if (type.equals(feature.getType())) {
+ filteredFeatures.add(feature);
+ }
+ }
+ return filteredFeatures;
+ }
+ }
+
+ @Override
+ public List getFeatures(String type, boolean isHidden) throws DeviceManagementException {
+ if (features == null) {
+ return null;
+ } else {
+ List filteredFeatures = new ArrayList<>();
+ if (StringUtils.isEmpty(type)) {
+ for (Feature feature : this.getFeatures()) {
+ if (isHidden == feature.isHidden()) {
+ filteredFeatures.add(feature);
+ }
+ }
+ return filteredFeatures;
+ } else {
+ for (Feature feature : this.getFeatures()) {
+ if (isHidden == feature.isHidden() && type.equals(feature.getType())) {
+ filteredFeatures.add(feature);
+ }
+ }
+ return filteredFeatures;
+ }
+ }
+ }
+
@Override
public boolean removeFeature(String name) throws DeviceManagementException {
return false;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/android.xml b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/android.xml
index 0320698ff4..3a9ce13404 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/android.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/android.xml
@@ -92,256 +92,474 @@
-
+
Ring
Ring the device
-
+
+
+ /api/device-mgt/android/v1.0/admin/devices/ring
+ POST
+ application/json
+ /device-mgt/devices/owning-device/operations/android/ring
+
-
- test
-
-
+
Device Lock
Lock the device
-
+
+
+
+
+ text
+ lock-message
+ Message to be sent to the device
+
+
+ checkbox
+ hard-lock
+ Hard lock enabled
+
+
+
+
+ /api/device-mgt/android/v1.0/admin/devices/lock-devices
+ POST
+ application/json
+ /device-mgt/devices/owning-device/operations/android/ring
+
-
+
Location
Request coordinates of device location
-
+
+
+ /api/device-mgt/android/v1.0/admin/devices/location
+ POST
+ application/json
+ /device-mgt/devices/owning-device/operations/android/location
+
-
+
Clear Password
- Clear current password
-
+ Clear current password (This functionality is only working with profile owners from Android 7.0 API 24 onwards.)
+
+
+ /api/device-mgt/android/v1.0/admin/devices/clear-password
+ POST
+ application/json
+ /device-mgt/devices/owning-device/operations/android/clear-passwor
+
-
+
Reboot
Reboot the device
-
+
+
+ /api/device-mgt/android/v1.0/admin/devices/reboot
+ POST
+ application/json
+ /device-mgt/devices/owning-device/operations/android/reboot
+
+
+ ownership
+ COPE
+ This feature is only available in COPE/COSU
+
+
+
-
+
Upgrade Firmware
Upgrade Firmware
-
+
+
+
+
+ checkbox
+ immediate
+ Instant Upgrade
+ Once enabled, device firmware upgrade process will start instantly.
+
+
+ text
+ schedule
+ Enter the date and time to schedule firmware upgrade.
+
+
+ text
+ server
+ Enter firmware upgrade server URL (ie. http://abc.com or http://abc.com/ota)
+
+
+
+
+ /api/device-mgt/android/v1.0/admin/devices/reboot
+ POST
+ application/json
+ /device-mgt/devices/owning-device/operations/android/upgrade-firmware
+
+
+ ownership
+ COPE
+ This feature is only available in COPE/COSU
+
+
+
-
+
Mute
Enable mute in the device
-
+
+
+ /api/device-mgt/android/v1.0/admin/devices/mute
+ POST
+ application/json
+ /device-mgt/devices/owning-device/operations/android/mute
+
-
+
Message
Send message
-
+
+
+
+
+ text
+ messageTitle
+ Title Here...
+
+
+ text
+ messageText
+ Message Here...
+
+
+
+
+ /api/device-mgt/android/v1.0/admin/devices/send-notification
+ POST
+ application/json
+ /device-mgt/devices/owning-device/operations/android/send-notification
+
-
+
Change Lock-code
- Change current lock code
-
+ Change current lock code (This functionality is only working with profile owners from Android 7.0 API 24 onwards.)
+
+
+ /api/device-mgt/android/v1.0/admin/devices/change-lock-code
+ POST
+ application/json
+ /device-mgt/devices/owning-device/operations/android/change-lock-code
+
-
+
+ File Transfer
+ Transfer file to the device
+
+
+
+
+ radio
+ directionSelection
+ upload
+
+ To device
+
+
+
+ radio
+ directionSelection
+ download
+
+ From device
+
+
+
+ select
+ protocolSelection
+ protocol
+
+ HTTP
+ FTP
+ SFTP
+
+ Protocol
+
+
+ text
+ fileURL
+ URL to upload file from device
+
+
+ info
+ defaultFileLocation
+ File will be saved in Default download directory if not specified.
+
+
+ text
+ fileLocation
+ File location in the device
+
+
+ checkbox
+ authentication
+ Authentication required
+
+
+ text
+ userName
+ Username
+
+
+ password
+ ftpPassword
+ Password (Ignore if not needed)
+
+
+
+
+ /api/device-mgt/android/v1.0/admin/devices/file-transfer
+ POST
+ application/json
+ /device-mgt/devices/owning-device/operations/android/file-transfer
+
+
+
+
Enterprise Wipe
Remove enterprise applications
-
+
+
+ /api/device-mgt/android/v1.0/admin/devices/enterprise-wipe
+ POST
+ application/json
+ /device-mgt/devices/owning-device/operations/android/enterprise-wipe
+
-
+
Wipe Data
Factory reset the device
-
+
+
+
+
+ text
+ pin
+ Enter PIN code* of the device.
+
+
+
+
+ /api/device-mgt/android/v1.0/admin/devices/wipe
+ POST
+ application/json
+ /device-mgt/devices/owning-device/operations/android/wipe
+
-
+
Wifi
Setting up wifi configuration
-
+
+ Global Proxy
+ Setting up a network-independent global HTTP proxy on a device.
+
+
Camera
Enable or disable camera
-
+
Email
Configure email settings
-
+
Device info
Request device information
-
+
Application List
Request list of current installed applications
-
+
Install App
Install App
-
+
Uninstall App
Uninstall App
-
+
Blacklist app
Blacklist applications
-
+
Encrypt Storage
Encrypt storage
-
+
Password Policy
Set passcode policy
-
+
Configure VPN
Configure VPN settings
-
+
Disallow user to change volume
Allow or disallow user to change volume"
-
+
Disallow bluetooth configuration
Allow or disallow bluetooth configuration
-
+
Disallow user to change cell broadcast configurations
Allow or disallow user to change cell broadcast configurations
-
+
Disallow user to change user credentials
Allow or disallow user to change user credentials
-
+
Disallow user to change mobile networks configurations
Allow or disallow user to change mobile networks configurations
-
+
Disallow user to change tethering configurations
Allow or disallow user to change tethering configurations
-
+
Disallow user to change VPN configurations
Allow or disallow user to change VPN configurations
-
+
Disallow user to change WIFI configurations
Allow or disallow user to change WIFI configurations
-
+
Disallow user to change app control
Allow or disallow user to change app control
-
+
Disallow window creation
Allow or disallow window creation
-
+
Disallow user to change app control configurations
Allow or disallow user to change app control configurations
-
+
Disallow cross profile copy paste
Allow or disallow cross profile copy paste
-
+
Disallow debugging features
Allow or disallow debugging features
-
+
Disallow factory reset
Allow or disallow factory reset
-
+
Disallow add user
Allow or disallow add user
-
+
Disallow install apps
Allow or disallow install apps
-
+
Disallow install unknown sources
Allow or disallow install unknown sources
-
+
Disallow modify account
Allow or disallow modify account
-
+
Disallow mount physical media
Allow or disallow mount physical media
-
+
Disallow network reset
Allow or disallow network reset
-
+
Disallow outgoing beam
Allow or disallow outgoing beam
-
+
Disallow outgoing calls
Allow or disallow outgoing calls
-
+
Disallow remove users
Allow or disallow remove users
-
+
Disallow safe boot
Allow or disallow safe boot
-
+
Disallow share location
Allow or disallow share location
-
+
Disallow sms
Allow or disallow sms
-
+
Disallow uninstall app
Allow or disallow uninstall app
-
+
Disallow unmute mic
Allow or disallow unmute mic
-
+
Disallow usb file transfer
Allow or disallow usb file transfer
-
+
Disallow parent profile app linking
Allow or disallow parent profile app linking
-
+
Disallow ensure verify apps
Allow or disallow ensure verify apps
-
+
Disallow auto timing
Allow or disallow auto timing
-
+
Remove device owner
Remove device owner
-
+
Fetch device logcat
Fetch device logcat
-
+
Unlock the device
Unlock the device
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/android_sense.xml b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/android_sense.xml
index fbc58a1115..a5a15b5d1c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/android_sense.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/android_sense.xml
@@ -19,15 +19,15 @@
-->
-
+
Add Keywords
Send keywords to the device
-
+
Add Threshold
Send Threshold to the device
-
+
Remove words
Remove Threshold from the device
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/arduino.xml b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/arduino.xml
index bca211a30b..55b5ee2ada 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/arduino.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/arduino.xml
@@ -19,13 +19,19 @@
-->
-
+
Control Bulb
Control Bulb on Arduino Uno
-
-
- state
-
+
+
+
+ state
+
+
+
+ /arduino/device/{deviceId}/bulb
+ POST
+
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/defective-devicetype2.xml b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/defective-devicetype2.xml
index 0f1baff1c3..258663057f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/defective-devicetype2.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/defective-devicetype2.xml
@@ -21,13 +21,19 @@
-
+
Control Bulb
Control Bulb on Arduino Uno
-
-
- state
-
+
+
+
+ state
+
+
+
+ /arduino/device/{deviceId}/bulb
+ POST
+
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/defective-devicetype3.xml b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/defective-devicetype3.xml
index 063ac8bd53..56f8f2bb56 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/defective-devicetype3.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/defective-devicetype3.xml
@@ -27,13 +27,19 @@
-
+
Control Bulb
Control Bulb on Arduino Uno
-
-
- state
-
+
+
+
+ state
+
+
+
+ /arduino/device/{deviceId}/bulb
+ POST
+
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/raspberrypi.xml b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/raspberrypi.xml
index 5115fafd8e..49c3a49539 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/raspberrypi.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/raspberrypi.xml
@@ -19,13 +19,19 @@
-->
-
+
Control Bulb
Control Bulb on Raspberrypi
-
-
- state
-
+
+
+
+ state
+
+
+
+ /raspberrypi/device/{deviceId}/bulb
+ POST
+
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/sample.xml b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/sample.xml
index 96e6fecc46..2943982aeb 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/sample.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/sample.xml
@@ -31,16 +31,23 @@
-
+
abc
this is a feature
-
-
- deviceId
-
-
- test
-
+
+
+
+ deviceId
+
+
+ test
+
+
+
+ /bulb/{state}
+ POST
+ application/json
+
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/sql-files/h2.sql b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/sql-files/h2.sql
index e2d3356c69..c6a935cfc4 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/sql-files/h2.sql
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/sql-files/h2.sql
@@ -400,7 +400,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_INFO (
ID INTEGER AUTO_INCREMENT NOT NULL,
DEVICE_ID INT NULL,
KEY_FIELD VARCHAR(45) NULL,
- VALUE_FIELD VARCHAR(100) NULL,
+ VALUE_FIELD VARCHAR(1000) NULL,
PRIMARY KEY (ID),
CONSTRAINT DM_DEVICE_INFO_DEVICE
FOREIGN KEY (DEVICE_ID)
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
index 7fdec2aefa..fb22f36fee 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
@@ -22,7 +22,7 @@
device-mgt
org.wso2.carbon.devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/operation.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/operation.js
index 1d18e05fe9..be04dda8f8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/operation.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/operation.js
@@ -16,6 +16,24 @@
* under the License.
*/
+/*
+ * 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.
+ */
+
var operationModule = function () {
var log = new Log("/app/modules/business-controllers/operation.js");
var utility = require('/app/modules/utility.js').utility;
@@ -38,8 +56,9 @@ var operationModule = function () {
}
privateMethods.getOperationsFromFeatures = function (deviceType, operationType) {
- var url = devicemgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"] + "/device-types/" + deviceType + "/features";
- var featuresList = serviceInvokers.XMLHttp.get(url, function (responsePayload) {
+ var url = devicemgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"] + "/device-types/"
+ + deviceType + "/features?featureType=" + operationType + "&hidden=false";
+ return serviceInvokers.XMLHttp.get(url, function (responsePayload) {
var features = JSON.parse(responsePayload.responseText);
var featureList = [];
var feature;
@@ -51,20 +70,40 @@ var operationModule = function () {
feature["contentType"] = features[i].contentType;
feature["deviceType"] = deviceType;
feature["params"] = [];
- var featuresEntry = utility.getDeviceTypeConfig(deviceType)["deviceType"]["features"];
- if (featuresEntry) {
- var featureEntry = featuresEntry[features[i].code];
- if (featureEntry) {
- var permissionEntry = featureEntry["permission"];
- if (permissionEntry) {
- feature["permission"] = permissionEntry
- }
- }
- }
var metaData = features[i].metadataEntries;
if (metaData) {
for (var j = 0; j < metaData.length; j++) {
- feature["params"].push(metaData[j].value);
+ if (metaData[j].name === "operationMeta") {
+ var operationMeta = metaData[j].value;
+ var params = {};
+ params["method"] = operationMeta.method;
+ params["pathParams"] = operationMeta.pathParams;
+ params["queryParams"] = operationMeta.queryParams;
+ params["formParams"] = operationMeta.formParams ? operationMeta.formParams : [];
+ params["uri"] = operationMeta.uri;
+ params["contentType"] = operationMeta.contentType;
+ feature["params"].push(params);
+ feature["permission"] = operationMeta.permission;
+ if (operationMeta.icon) {
+ //Check if icon is a path or font
+ if (operationMeta.icon.indexOf("path:") === 0) {
+ feature["icon"] = operationMeta.icon.replace("path:", "");
+ } else {
+ feature["iconFont"] = operationMeta.icon;
+ }
+ }
+ if (operationMeta.uiParams && operationMeta.uiParams.length > 0) {
+ feature["uiParams"] = operationMeta.uiParams;
+ }
+ if (operationMeta.filters) {
+ feature["filters"] = operationMeta.filters;
+ }
+ if (operationMeta.ownershipDescription) {
+ feature["ownershipDescription"] = operationMeta.ownershipDescription;
+ }
+ continue;
+ }
+ feature["metadata"].push(metaData[j].value);
}
featureList.push(feature);
}
@@ -76,39 +115,27 @@ var operationModule = function () {
return response;
}
);
- return featuresList;
};
publicMethods.getControlOperations = function (device) {
var deviceType = device.type;
var operations = privateMethods.getOperationsFromFeatures(deviceType, "operation");
- var features = utility.getDeviceTypeConfig(deviceType).deviceType.features;
for (var op in operations) {
- var iconIdentifier = operations[op].operation;
- if (features && features[iconIdentifier]) {
- var icon = features[iconIdentifier].icon;
- //TODO: need improve this check to get feature availability from agent side
- var filter = features[iconIdentifier].filter;
- if (device && filter && filter.property && device[filter.property] !== filter.value) {
- operations[op]["isDisabled"] = true;
- operations[op]["disabledText"] = filter.text;
- } else {
- operations[op]["isDisabled"] = false;
- }
- if (icon) {
- operations[op]["iconFont"] = icon;
- } else if (iconPath) {
- var iconPath = utility.getOperationIcon(deviceType, iconIdentifier);
- operations[op]["icon"] = iconPath;
- }
- var formParams = features[iconIdentifier].formParams;
- if (formParams) {
- operations[op]["uiParams"] = formParams;
+ if (operations.hasOwnProperty(op)) {
+ operations[op]["isDisabled"] = false;
+ if (device && operations[op].filters && operations[op].filters.length > 0) {
+ var filters = operations[op].filters;
+ for (var filter in filters) {
+ if (filters.hasOwnProperty(filter)) {
+ if (device[filters[filter].property] !== filters[filter].value) {
+ operations[op]["isDisabled"] = true;
+ operations[op]["disabledText"] = operations[op]["disabledText"] ?
+ operations[op]["disabledText"] + ", " + filters[filter].description :
+ filters[filter].description;
+ }
+ }
+ }
}
- // var icon = utility.getOperationIcon(deviceType, iconIdentifier);
- // if (icon) {
- // log.error("icon found : " + icon );
- // operations[op]["icon"] = icon;
}
}
return operations;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
index 0ff41a245b..cb067c464c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
@@ -15,6 +15,24 @@
specific language governing permissions and limitations
under the License.
}}
+
+{{!
+ 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.
+}}
{{unit "cdmf.unit.ui.title" pageTitle="Device Management"}}
{{unit "cdmf.unit.data-tables-extended"}}
@@ -181,7 +199,7 @@
+
+
+
+
+
@@ -508,7 +544,6 @@
-
-
+
+
+
+
+
Adding operations to devices of multiple device types is not supported.
+ Please select one or more devices in the same device type.
+
+
+
+
+
+
+
+
+
+
No compatible operations are available for the selected device type.
+
+
+
+
+
+
device-mgt
org.wso2.carbon.devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml
index 615107c749..467431868d 100644
--- a/components/device-mgt/pom.xml
+++ b/components/device-mgt/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml b/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
index 49f5243938..54b2b34142 100644
--- a/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
+++ b/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
email-sender
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
diff --git a/components/email-sender/pom.xml b/components/email-sender/pom.xml
index a214bdee0e..a69ce39916 100644
--- a/components/email-sender/pom.xml
+++ b/components/email-sender/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
index b034fb6f95..d22be87106 100644
--- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
+++ b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
@@ -22,13 +22,13 @@
org.wso2.carbon.devicemgt
identity-extensions
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.oauth.extensions
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
bundle
WSO2 Carbon - OAuth Extensions
http://wso2.org
diff --git a/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml b/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
index 4e3e14937f..c2eac834b1 100644
--- a/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
+++ b/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
@@ -21,7 +21,7 @@
identity-extensions
org.wso2.carbon.devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
4.0.0
diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml b/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
index 393eab4392..e1af3d5565 100644
--- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
+++ b/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
identity-extensions
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
diff --git a/components/identity-extensions/pom.xml b/components/identity-extensions/pom.xml
index fb643bde49..353bf1aba3 100644
--- a/components/identity-extensions/pom.xml
+++ b/components/identity-extensions/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
diff --git a/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml b/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
index dcd65f81ff..98f0fd707b 100644
--- a/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
policy-mgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.devicemgt
org.wso2.carbon.complex.policy.decision.point
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
bundle
WSO2 Carbon - Policy Decision Point
WSO2 Carbon - Policy Decision Point
diff --git a/components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
index 908f16c61b..81d1fdf53c 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
@@ -3,14 +3,14 @@
org.wso2.carbon.devicemgt
policy-mgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.devicemgt
org.wso2.carbon.policy.decision.point
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
bundle
WSO2 Carbon - Policy Decision Point
WSO2 Carbon - Policy Decision Point
diff --git a/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
index 481cecdc9c..e4d411ba87 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
@@ -3,7 +3,7 @@
org.wso2.carbon.devicemgt
policy-mgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
@@ -11,7 +11,7 @@
4.0.0
org.wso2.carbon.devicemgt
org.wso2.carbon.policy.information.point
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
bundle
WSO2 Carbon - Policy Information Point
WSO2 Carbon - Policy Information Point
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
index 4dc6e71631..06b8e2abbe 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
policy-mgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.devicemgt
org.wso2.carbon.policy.mgt.common
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
bundle
WSO2 Carbon - Policy Management Common
WSO2 Carbon - Policy Management Common
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
index 0bf2dd3e29..233f24eecb 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
policy-mgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.devicemgt
org.wso2.carbon.policy.mgt.core
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
bundle
WSO2 Carbon - Policy Management Core
WSO2 Carbon - Policy Management Core
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/mock/TypeXDeviceManagementService.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/mock/TypeXDeviceManagementService.java
index 5c2d1e11a8..9bcd089eb0 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/mock/TypeXDeviceManagementService.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/mock/TypeXDeviceManagementService.java
@@ -14,6 +14,23 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
+ *
+ *
+ * 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.policy.mgt.core.mock;
@@ -24,6 +41,7 @@ import org.wso2.carbon.device.mgt.common.InitialOperationConfig;
import org.wso2.carbon.device.mgt.common.MonitoringOperation;
import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
+import org.wso2.carbon.device.mgt.common.StartupOperationConfig;
import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
import org.wso2.carbon.device.mgt.common.general.GeneralConfig;
import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
@@ -89,6 +107,11 @@ public class TypeXDeviceManagementService implements DeviceManagementService {
return null;
}
+ @Override
+ public StartupOperationConfig getStartupOperationConfig() {
+ return null;
+ }
+
@Override
public PullNotificationSubscriber getPullNotificationSubscriber() {
return null;
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/sql/CreateH2TestDB.sql b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/sql/CreateH2TestDB.sql
index 289ac3ec3e..e236efe7ff 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/sql/CreateH2TestDB.sql
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/sql/CreateH2TestDB.sql
@@ -467,7 +467,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_INFO (
DEVICE_ID INT NULL,
ENROLMENT_ID INT NOT NULL,
KEY_FIELD VARCHAR(45) NULL,
- VALUE_FIELD VARCHAR(500) NULL,
+ VALUE_FIELD VARCHAR(1000) NULL,
PRIMARY KEY (ID),
CONSTRAINT DM_DEVICE_INFO_DEVICE
FOREIGN KEY (DEVICE_ID)
diff --git a/components/policy-mgt/pom.xml b/components/policy-mgt/pom.xml
index 12a0ef13c5..d8975fff62 100644
--- a/components/policy-mgt/pom.xml
+++ b/components/policy-mgt/pom.xml
@@ -23,13 +23,13 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
4.0.0
policy-mgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
pom
WSO2 Carbon - Policy Management Component
http://wso2.org
diff --git a/components/test-coverage/pom.xml b/components/test-coverage/pom.xml
index b1fd8426e9..9bf463b2ec 100644
--- a/components/test-coverage/pom.xml
+++ b/components/test-coverage/pom.xml
@@ -21,7 +21,7 @@
carbon-devicemgt
org.wso2.carbon.devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml b/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml
index 16090c509e..2fe4013823 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml
+++ b/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml
@@ -23,13 +23,13 @@
ui-request-interceptor
io.entgra.devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
4.0.0
io.entgra.ui.request.interceptor
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
war
Entgra - Request Handling Proxy Servlet
Proxy Service for Request Handling in Entgra EMM/IOT Server.
diff --git a/components/ui-request-interceptor/pom.xml b/components/ui-request-interceptor/pom.xml
index f362dfd78e..fb0f2f9c8f 100644
--- a/components/ui-request-interceptor/pom.xml
+++ b/components/ui-request-interceptor/pom.xml
@@ -23,7 +23,7 @@
carbon-devicemgt
org.wso2.carbon.devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
index 67f722d94e..1817b8293b 100644
--- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
+++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
@@ -21,14 +21,14 @@
org.wso2.carbon.devicemgt
webapp-authenticator-framework
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.devicemgt
org.wso2.carbon.webapp.authenticator.framework
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
bundle
WSO2 Carbon - Web Application Authenticator Framework Bundle
WSO2 Carbon - Web Application Authenticator Framework Bundle
diff --git a/components/webapp-authenticator-framework/pom.xml b/components/webapp-authenticator-framework/pom.xml
index 05bef7fe41..074c9756a5 100644
--- a/components/webapp-authenticator-framework/pom.xml
+++ b/components/webapp-authenticator-framework/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
4.0.0
org.wso2.carbon.devicemgt
webapp-authenticator-framework
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
pom
WSO2 Carbon - Webapp Authenticator Framework
http://wso2.org
diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
index 2560e0f229..8bf6a41e4c 100644
--- a/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
+++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
@@ -21,14 +21,14 @@
org.wso2.carbon.devicemgt
apimgt-extensions-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.apimgt.application.extension.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - API Management Application Extension Feature
http://wso2.org
This feature contains an implementation of a api application registration, which takes care of subscription
diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml
index 32df7e6471..220398d2de 100644
--- a/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml
+++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
apimgt-extensions-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.apimgt.handler.server.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - Device Management - APIM handler Server Feature
http://wso2.org
This feature contains the handler for the api authentications
diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml
index 539f83a509..0ca7cac7ff 100644
--- a/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml
+++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml
@@ -21,13 +21,13 @@
org.wso2.carbon.devicemgt
apimgt-extensions-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.apimgt.integration.client.feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
pom
WSO2 Carbon - APIM Integration Client Feature
http://wso2.org
diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
index 989a8bf2bd..9b057d4e59 100644
--- a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
+++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
@@ -21,14 +21,14 @@
org.wso2.carbon.devicemgt
apimgt-extensions-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.apimgt.webapp.publisher.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - API Management Webapp Publisher Feature
http://wso2.org
This feature contains an implementation of a Tomcat lifecycle listener, which takes care of publishing
diff --git a/features/apimgt-extensions/pom.xml b/features/apimgt-extensions/pom.xml
index e7b1aabaf9..bab31ded4a 100644
--- a/features/apimgt-extensions/pom.xml
+++ b/features/apimgt-extensions/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
4.0.0
org.wso2.carbon.devicemgt
apimgt-extensions-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
pom
WSO2 Carbon - API Management Extensions Feature
http://wso2.org
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml
index b2a6ac81a6..b4d28b0899 100644
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml
@@ -22,13 +22,13 @@
org.wso2.carbon.devicemgt
application-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.application.mgt.api.feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
pom
WSO2 Carbon - Application Management API Feature
http://wso2.org
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/pom.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/pom.xml
index d3395140f4..9a50665f55 100644
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/pom.xml
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/pom.xml
@@ -22,13 +22,13 @@
org.wso2.carbon.devicemgt
application-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.application.mgt.publisher.ui.feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
pom
WSO2 Carbon - Application Management Publisher UI Feature
http://wso2.org
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml
index 8e1102230d..763879a0ab 100644
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
application-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.application.mgt.server.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - Application Management Server Feature
http://wso2.org
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql
index e0d12e9289..180aa9fcd9 100644
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql
@@ -61,6 +61,7 @@ CREATE TABLE IF NOT EXISTS AP_APP_REVIEW(
MODIFIED_AT TIMESTAMP NOT NULL,
RATING INTEGER NULL,
USERNAME VARCHAR(45) NOT NULL,
+ ACTIVE_REVIEW BOOLEAN NOT NULL DEFAULT TRUE,
AP_APP_RELEASE_ID INTEGER NOT NULL,
PRIMARY KEY (ID),
CONSTRAINT fk_AP_APP_COMMENT_AP_APP_RELEASE1
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/pom.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/pom.xml
index bfaab4fdda..84504bbb77 100644
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/pom.xml
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/pom.xml
@@ -23,12 +23,12 @@
org.wso2.carbon.devicemgt
application-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
4.0.0
org.wso2.carbon.device.application.mgt.store.ui.feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
pom
WSO2 Carbon - Application Management Store UI Feature
http://wso2.org
diff --git a/features/application-mgt/pom.xml b/features/application-mgt/pom.xml
index c376da5fc0..8e87df4cb5 100644
--- a/features/application-mgt/pom.xml
+++ b/features/application-mgt/pom.xml
@@ -22,13 +22,13 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
4.0.0
application-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
pom
WSO2 Carbon - Application Management Feature
http://wso2.org
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
index b4cbc9f40c..51e1bd89b9 100644
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
certificate-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
@@ -62,29 +62,6 @@
-
- copy v09 api
- package
-
- copy
-
-
-
-
- org.wso2.carbon.devicemgt
- org.wso2.carbon.certificate.mgt.v09.api
-
- ${project.version}
- war
- true
-
- ${project.build.directory}/maven-shared-archive-resources/webapps
-
- api#scep-mgt#v0.9.war
-
-
-
-
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
index 18238058b5..4b171ffaab 100644
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
certificate-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
index 789e0a086a..baf101b5cd 100644
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
certificate-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.certificate.mgt.server.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - Certificate Management Server Feature
http://wso2.org
This feature contains the core bundles required for back-end Certificate Management functionality
diff --git a/features/certificate-mgt/pom.xml b/features/certificate-mgt/pom.xml
index 37385a19dd..2b5924f92d 100644
--- a/features/certificate-mgt/pom.xml
+++ b/features/certificate-mgt/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
4.0.0
org.wso2.carbon.devicemgt
certificate-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
pom
WSO2 Carbon - Certificate Management Feature
http://wso2.org
diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml
index 31cbc563b5..4d190fef72 100644
--- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml
+++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
device-mgt-extensions-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - Device Type Deployer Feature
http://wso2.org
WSO2 Carbon - Device Type Deployer Feature
diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
index 7f583da593..fcf69b1db6 100644
--- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
+++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
device-mgt-extensions-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - FCM Based Push Notification Provider Feature
http://wso2.org
WSO2 Carbon - MQTT Based Push Notification Provider Feature
diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml
index 7180fe41c1..b208a7c308 100644
--- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml
+++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
device-mgt-extensions-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - MQTT Based Push Notification Provider Feature
http://wso2.org
WSO2 Carbon - MQTT Based Push Notification Provider Feature
diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
index 69108c52c6..b6502c8ccd 100644
--- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
+++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
device-mgt-extensions-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - MQTT Based Push Notification Provider Feature
http://wso2.org
WSO2 Carbon - MQTT Based Push Notification Provider Feature
diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
index 125edb16a5..28944feb1c 100644
--- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
+++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
device-mgt-extensions-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - XMPP Based Push Notification Provider Feature
http://wso2.org
WSO2 Carbon - XMPP Based Push Notification Provider Feature
diff --git a/features/device-mgt-extensions/pom.xml b/features/device-mgt-extensions/pom.xml
index cbf504932e..520114e0f3 100644
--- a/features/device-mgt-extensions/pom.xml
+++ b/features/device-mgt-extensions/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml
index 7ab57b525e..aecea6ff57 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
device-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.analytics.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - Device Management Server Feature
http://wso2.org
This feature contains bundles related to device analytics data publisher and ws proxy
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
index 5aebf97f7b..77b578be3f 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
device-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml
index 530474529f..c80dc67907 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
device-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
index 0309c8b15c..1e52dfc6d5 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS DM_GROUP (
ID INTEGER AUTO_INCREMENT NOT NULL,
GROUP_NAME VARCHAR(100) DEFAULT NULL,
DESCRIPTION TEXT DEFAULT NULL,
- OWNER VARCHAR(45) DEFAULT NULL,
+ OWNER VARCHAR(255) DEFAULT NULL,
TENANT_ID INTEGER DEFAULT 0,
PRIMARY KEY (ID)
);
@@ -110,7 +110,7 @@ CREATE TABLE IF NOT EXISTS DM_PROFILE_OPERATION (
CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
ID INTEGER AUTO_INCREMENT NOT NULL,
DEVICE_ID INTEGER NOT NULL,
- OWNER VARCHAR(50) NOT NULL,
+ OWNER VARCHAR(255) NOT NULL,
OWNERSHIP VARCHAR(45) DEFAULT NULL,
STATUS VARCHAR(50) NULL,
DATE_OF_ENROLMENT TIMESTAMP DEFAULT NULL,
@@ -413,7 +413,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_INFO (
DEVICE_ID INT NULL,
ENROLMENT_ID INT NOT NULL,
KEY_FIELD VARCHAR(45) NULL,
- VALUE_FIELD VARCHAR(500) NULL,
+ VALUE_FIELD VARCHAR(1000) NULL,
PRIMARY KEY (ID),
CONSTRAINT DM_DEVICE_INFO_DEVICE
FOREIGN KEY (DEVICE_ID)
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
index 3cb20bf48c..5577981411 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
@@ -20,7 +20,7 @@ IF NOT EXISTS(SELECT *
ID INTEGER IDENTITY (1, 1) NOT NULL,
GROUP_NAME VARCHAR(100) DEFAULT NULL,
DESCRIPTION VARCHAR(MAX) DEFAULT NULL,
- OWNER VARCHAR(45) DEFAULT NULL,
+ OWNER VARCHAR(255) DEFAULT NULL,
TENANT_ID INTEGER DEFAULT 0,
PRIMARY KEY (ID)
);
@@ -140,7 +140,7 @@ IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[D
CREATE TABLE DM_ENROLMENT (
ID INTEGER IDENTITY(1,1) NOT NULL,
DEVICE_ID INTEGER NOT NULL,
- OWNER VARCHAR(50) NOT NULL,
+ OWNER VARCHAR(255) NOT NULL,
OWNERSHIP VARCHAR(45) DEFAULT NULL,
STATUS VARCHAR(50) NULL,
DATE_OF_ENROLMENT DATETIME2 DEFAULT NULL,
@@ -457,7 +457,7 @@ CREATE TABLE DM_DEVICE_INFO (
DEVICE_ID INTEGER NULL,
ENROLMENT_ID INTEGER NOT NULL,
KEY_FIELD VARCHAR(45) NULL,
- VALUE_FIELD VARCHAR(500) NULL,
+ VALUE_FIELD VARCHAR(1000) NULL,
PRIMARY KEY (ID),
INDEX DM_DEVICE_INFO_DEVICE_idx (DEVICE_ID ASC),
INDEX DM_DEVICE_INFO_DEVICE_ENROLLMENT_idx (ENROLMENT_ID ASC)
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
index d26be88d15..54b50c785b 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS DM_GROUP (
ID INTEGER AUTO_INCREMENT NOT NULL,
GROUP_NAME VARCHAR(100) DEFAULT NULL,
DESCRIPTION TEXT DEFAULT NULL,
- OWNER VARCHAR(45) DEFAULT NULL,
+ OWNER VARCHAR(255) DEFAULT NULL,
TENANT_ID INTEGER DEFAULT 0,
PRIMARY KEY (ID)
)
@@ -125,7 +125,7 @@ CREATE TABLE IF NOT EXISTS DM_PROFILE_OPERATION (
CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
ID INTEGER AUTO_INCREMENT NOT NULL,
DEVICE_ID INTEGER NOT NULL,
- OWNER VARCHAR(50) NOT NULL,
+ OWNER VARCHAR(255) NOT NULL,
OWNERSHIP VARCHAR(45) DEFAULT NULL,
STATUS VARCHAR(50) NULL,
DATE_OF_ENROLMENT TIMESTAMP NULL DEFAULT NULL,
@@ -472,7 +472,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_INFO (
DEVICE_ID INT NULL,
ENROLMENT_ID INT NOT NULL,
KEY_FIELD VARCHAR(45) NULL,
- VALUE_FIELD VARCHAR(500) NULL,
+ VALUE_FIELD VARCHAR(1000) NULL,
PRIMARY KEY (ID),
INDEX DM_DEVICE_INFO_DEVICE_idx (DEVICE_ID ASC),
INDEX DM_DEVICE_INFO_DEVICE_ENROLLMENT_idx (ENROLMENT_ID ASC),
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
index 9779106272..e6977b38e8 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
@@ -27,7 +27,7 @@ CREATE TABLE DM_GROUP (
ID NUMBER(10) NOT NULL,
DESCRIPTION CLOB DEFAULT NULL,
GROUP_NAME VARCHAR2(100) DEFAULT NULL,
- OWNER VARCHAR2(45) DEFAULT NULL,
+ OWNER VARCHAR2(255) DEFAULT NULL,
TENANT_ID NUMBER(10) DEFAULT 0,
CONSTRAINT PK_DM_GROUP PRIMARY KEY (ID)
)
@@ -201,7 +201,7 @@ CREATE TABLE DM_PROFILE_OPERATION (
CREATE TABLE DM_ENROLMENT (
ID NUMBER(10) NOT NULL,
DEVICE_ID NUMBER(10) NOT NULL,
- OWNER VARCHAR2(50) NOT NULL,
+ OWNER VARCHAR2(255) NOT NULL,
OWNERSHIP VARCHAR2(45) DEFAULT NULL,
STATUS VARCHAR2(50) NULL,
DATE_OF_ENROLMENT TIMESTAMP(0) DEFAULT NULL,
@@ -791,7 +791,7 @@ CREATE TABLE DM_DEVICE_INFO (
DEVICE_ID NUMBER(10) NOT NULL,
ENROLMENT_ID NUMBER(10) NOT NULL,
KEY_FIELD VARCHAR2(45) NULL,
- VALUE_FIELD VARCHAR2(500) NULL,
+ VALUE_FIELD VARCHAR2(1000) NULL,
PRIMARY KEY (ID),
CONSTRAINT DM_DEVICE_INFO_DEVICE
FOREIGN KEY (DEVICE_ID)
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
index 6e6f3c3be2..eea13430c9 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS DM_GROUP (
ID BIGSERIAL NOT NULL PRIMARY KEY,
GROUP_NAME VARCHAR(100) DEFAULT NULL,
DESCRIPTION TEXT DEFAULT NULL,
- OWNER VARCHAR(45) DEFAULT NULL,
+ OWNER VARCHAR(255) DEFAULT NULL,
TENANT_ID INTEGER DEFAULT 0
);
@@ -108,7 +108,7 @@ CREATE TABLE IF NOT EXISTS DM_PROFILE_OPERATION (
CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
ID BIGSERIAL NOT NULL PRIMARY KEY,
DEVICE_ID INTEGER NOT NULL,
- OWNER VARCHAR(50) NOT NULL,
+ OWNER VARCHAR(255) NOT NULL,
OWNERSHIP VARCHAR(45) DEFAULT NULL,
STATUS VARCHAR(50) NULL,
DATE_OF_ENROLMENT TIMESTAMP NULL DEFAULT NULL,
@@ -417,7 +417,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_INFO (
DEVICE_ID INT NOT NULL,
ENROLMENT_ID INT NOT NULL,
KEY_FIELD VARCHAR(45) NULL,
- VALUE_FIELD VARCHAR(500) NULL,
+ VALUE_FIELD VARCHAR(1000) NULL,
CONSTRAINT DM_DEVICE_INFO_DEVICE
FOREIGN KEY (DEVICE_ID)
REFERENCES DM_DEVICE (ID)
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
index a3b6acf944..f83c1fe036 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
@@ -4,14 +4,14 @@
org.wso2.carbon.devicemgt
device-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.extensions.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - Device Management Extensions Feature
http://wso2.org
This feature contains common extensions used by key device management functionalities
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
index 20b89ca954..c044249fc6 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
device-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
index ab1900950c..59cde68bda 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
device-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.server.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - Device Management Server Feature
http://wso2.org
This feature contains the core bundles required for Back-end Device Management functionality
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml
index 22843f6cb4..871a4f4799 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
device-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
diff --git a/features/device-mgt/pom.xml b/features/device-mgt/pom.xml
index a15b4187d2..3b77b3b6a9 100644
--- a/features/device-mgt/pom.xml
+++ b/features/device-mgt/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml b/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
index 97be9df71f..92415332fe 100644
--- a/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
+++ b/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
email-sender-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.email.sender.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - Email Sender Feature
http://wso2.org
This feature contains the core bundles required for email sender related functionality
diff --git a/features/email-sender/pom.xml b/features/email-sender/pom.xml
index a10558e96d..53fa11814e 100644
--- a/features/email-sender/pom.xml
+++ b/features/email-sender/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
4.0.0
org.wso2.carbon.devicemgt
email-sender-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
pom
WSO2 Carbon - Email Sender Feature
http://wso2.org
diff --git a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml b/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
index 3697089da4..25a5e651f6 100644
--- a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
+++ b/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
@@ -23,14 +23,14 @@
org.wso2.carbon.devicemgt
jwt-client-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.identity.jwt.client.extension.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - JWT Client Feature
http://wso2.org
This feature contains jwt client implementation from which we can get a access token using the jwt
diff --git a/features/jwt-client/pom.xml b/features/jwt-client/pom.xml
index fe40aa0ed2..a48dddeb9e 100644
--- a/features/jwt-client/pom.xml
+++ b/features/jwt-client/pom.xml
@@ -23,13 +23,13 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
4.0.0
jwt-client-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
pom
WSO2 Carbon - JWT Client Extension Feature
http://wso2.org
diff --git a/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml b/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
index 9fa5dfbfa0..8411900330 100644
--- a/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
+++ b/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
@@ -23,14 +23,14 @@
org.wso2.carbon.devicemgt
oauth-extensions-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.oauth.extensions.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - Device Mgt OAuth Extensions Feature
http://wso2.org
This feature contains devicemgt related OAuth extensions
diff --git a/features/oauth-extensions/pom.xml b/features/oauth-extensions/pom.xml
index 2080b5e073..7d03dc8a4f 100644
--- a/features/oauth-extensions/pom.xml
+++ b/features/oauth-extensions/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
4.0.0
org.wso2.carbon.devicemgt
oauth-extensions-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
pom
WSO2 Carbon - Device Management OAuth Extensions Feature
http://wso2.org
diff --git a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
index 6c25977214..6e6ce6c810 100644
--- a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
+++ b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
@@ -23,14 +23,14 @@
org.wso2.carbon.devicemgt
policy-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.policy.mgt.server.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - Policy Management Server Feature
http://wso2.org
This feature contains the core bundles required for Back-end Device Management functionality
diff --git a/features/policy-mgt/pom.xml b/features/policy-mgt/pom.xml
index 894d3df5af..3a43d684c4 100644
--- a/features/policy-mgt/pom.xml
+++ b/features/policy-mgt/pom.xml
@@ -23,14 +23,14 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
4.0.0
org.wso2.carbon.devicemgt
policy-mgt-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
pom
WSO2 Carbon - Policy Management Feature
http://wso2.org
diff --git a/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/pom.xml b/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/pom.xml
index 2080341a2d..b014dc0392 100644
--- a/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/pom.xml
+++ b/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/pom.xml
@@ -23,7 +23,7 @@
ui-request-interceptor-feature
io.entgra.devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
4.0.0
diff --git a/features/ui-request-interceptor/pom.xml b/features/ui-request-interceptor/pom.xml
index dd3086e5d0..7adc02f002 100644
--- a/features/ui-request-interceptor/pom.xml
+++ b/features/ui-request-interceptor/pom.xml
@@ -23,7 +23,7 @@
carbon-devicemgt
org.wso2.carbon.devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
index 9a9ccec638..ba04cef262 100644
--- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
+++ b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
webapp-authenticator-framework-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.webapp.authenticator.framework.server.feature
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - Webapp Authenticator Framework Server Feature
http://wso2.org
This feature contains the core bundles required for Back-end Device Management functionality
diff --git a/features/webapp-authenticator-framework/pom.xml b/features/webapp-authenticator-framework/pom.xml
index ff10a668d3..fe9aa0cf0c 100644
--- a/features/webapp-authenticator-framework/pom.xml
+++ b/features/webapp-authenticator-framework/pom.xml
@@ -22,14 +22,14 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
../../pom.xml
4.0.0
org.wso2.carbon.devicemgt
webapp-authenticator-framework-feature
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
pom
WSO2 Carbon - Webapp Authenticator Framework Feature
http://wso2.org
diff --git a/pom.xml b/pom.xml
index 029e7a01d6..f3b33c70e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.wso2.carbon.devicemgt
carbon-devicemgt
pom
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
WSO2 Carbon - Device Management - Parent
http://wso2.org
WSO2 Connected Device Manager Components
@@ -2082,7 +2082,7 @@
1.2.11.wso2v10
- 3.2.5-SNAPSHOT
+ 3.2.7-SNAPSHOT
4.6.21