diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml index f930cba450..17f3fbef32 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml @@ -104,6 +104,7 @@ org.wso2.carbon.registry.core, org.wso2.carbon.registry.core.*, org.wso2.carbon.utils.*, + javax.xml.namespace DeviceTypeDeployer diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypeDeployer.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypeDeployer.java index e5905f1c94..ff74abb0a3 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypeDeployer.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypeDeployer.java @@ -29,7 +29,7 @@ import org.osgi.framework.ServiceRegistration; import org.w3c.dom.Document; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService; -import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.DeviceManagementConfiguration; +import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.DeviceTypeConfiguration; import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.exception.DeviceTypeConfigurationException; import org.wso2.carbon.device.mgt.extensions.device.type.deployer.internal.DeviceTypeManagementDataHolder; import org.wso2.carbon.device.mgt.extensions.device.type.deployer.template.DeviceTypeConfigIdentifier; @@ -72,16 +72,16 @@ public class DeviceTypeDeployer extends AbstractDeployer { @Override public void deploy(DeploymentFileData deploymentFileData) throws DeploymentException { try { - DeviceManagementConfiguration deviceManagementConfiguration = getDeviceTypeConfiguration( + DeviceTypeConfiguration deviceTypeConfiguration = getDeviceTypeConfiguration( deploymentFileData.getFile().getAbsoluteFile()); - String deviceType = deviceManagementConfiguration.getDeviceType(); + String deviceType = deviceTypeConfiguration.getName(); String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain(true); if (deviceType != null && !deviceType.isEmpty() && tenantDomain != null && !tenantDomain.isEmpty()) { DeviceTypeConfigIdentifier deviceTypeConfigIdentifier = new DeviceTypeConfigIdentifier(deviceType, tenantDomain); ServiceRegistration serviceRegistration = registerDeviceType(deviceTypeConfigIdentifier, - deviceManagementConfiguration); + deviceTypeConfiguration); this.deviceTypeServiceRegistrations.put(deploymentFileData.getAbsolutePath(), serviceRegistration); this.deviceTypeConfigurationDataMap.put(deploymentFileData.getAbsolutePath(), deviceTypeConfigIdentifier); @@ -102,16 +102,16 @@ public class DeviceTypeDeployer extends AbstractDeployer { + deviceTypeConfigIdentifier.getTenantDomain()); } - private DeviceManagementConfiguration getDeviceTypeConfiguration(File configurationFile) + private DeviceTypeConfiguration getDeviceTypeConfiguration(File configurationFile) throws DeviceTypeConfigurationException { try { Document doc = DeviceTypeConfigUtil.convertToDocument(configurationFile); /* Un-marshaling Webapp Authenticator configuration */ - JAXBContext ctx = JAXBContext.newInstance(DeviceManagementConfiguration.class); + JAXBContext ctx = JAXBContext.newInstance(DeviceTypeConfiguration.class); Unmarshaller unmarshaller = ctx.createUnmarshaller(); //unmarshaller.setSchema(getSchema()); - return (DeviceManagementConfiguration) unmarshaller.unmarshal(doc); + return (DeviceTypeConfiguration) unmarshaller.unmarshal(doc); } catch (JAXBException e) { throw new DeviceTypeConfigurationException("Error occurred while un-marshalling the file " + configurationFile.getAbsolutePath(), e); @@ -119,7 +119,7 @@ public class DeviceTypeDeployer extends AbstractDeployer { } private ServiceRegistration registerDeviceType(DeviceTypeConfigIdentifier deviceTypeConfigIdentifier, - DeviceManagementConfiguration deviceManagementConfiguration) { + DeviceTypeConfiguration deviceManagementConfiguration) { DeviceTypeManagerService deviceTypeManagerService = new DeviceTypeManagerService(deviceTypeConfigIdentifier, deviceManagementConfiguration); BundleContext bundleContext = DeviceTypeManagementDataHolder.getInstance().getBundleContext(); diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Attributes.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Attributes.java index 5ca4511026..c52b1419de 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Attributes.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Attributes.java @@ -36,7 +36,14 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="Attribute" type="{}Attribute" maxOccurs="unbounded" minOccurs="0"/> + * <element name="Attribute" maxOccurs="unbounded" minOccurs="0"> + * <simpleType> + * <restriction base="{http://www.w3.org/2001/XMLSchema}string"> + * <enumeration value="column1"/> + * <enumeration value="column2"/> + * </restriction> + * </simpleType> + * </element> * </sequence> * </restriction> * </complexContent> @@ -52,7 +59,7 @@ import javax.xml.bind.annotation.XmlType; public class Attributes { @XmlElement(name = "Attribute") - protected List attribute; + protected List attribute; /** * Gets the value of the attribute property. @@ -72,13 +79,13 @@ public class Attributes { * *

* Objects of the following type(s) are allowed in the list - * {@link Attribute } + * {@link String } * * */ - public List getAttribute() { + public List getAttribute() { if (attribute == null) { - attribute = new ArrayList(); + attribute = new ArrayList(); } return this.attribute; } diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Properties.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/ConfigProperties.java similarity index 93% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Properties.java rename to components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/ConfigProperties.java index 177b8fd90b..1280d8165c 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Properties.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/ConfigProperties.java @@ -27,12 +27,12 @@ import javax.xml.bind.annotation.XmlType; /** - *

Java class for Properties complex type. + *

Java class for ConfigProperties complex type. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <complexType name="Properties">
+ * <complexType name="ConfigProperties">
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
@@ -46,10 +46,10 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Properties", propOrder = {
+@XmlType(name = "ConfigProperties", propOrder = {
     "property"
 })
-public class Properties {
+public class ConfigProperties {
 
     @XmlElement(name = "Property")
     protected List property;
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DataSource.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DataSource.java
new file mode 100644
index 0000000000..d55db0e6cb
--- /dev/null
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DataSource.java
@@ -0,0 +1,107 @@
+/*
+ *   Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.mgt.extensions.device.type.deployer.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 DataSource complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="DataSource">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="jndiConfig" type="{}jndiConfig"/>
+ *         <element name="tableConfig" type="{}tableConfig"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "DataSource", propOrder = { + "jndiConfig", + "tableConfig" +}) +public class DataSource { + + @XmlElement(required = true) + protected JndiConfig jndiConfig; + @XmlElement(required = true) + protected TableConfig tableConfig; + + /** + * Gets the value of the jndiConfig property. + * + * @return + * possible object is + * {@link JndiConfig } + * + */ + public JndiConfig getJndiConfig() { + return jndiConfig; + } + + /** + * Sets the value of the jndiConfig property. + * + * @param value + * allowed object is + * {@link JndiConfig } + * + */ + public void setJndiConfig(JndiConfig value) { + this.jndiConfig = value; + } + + /** + * Gets the value of the tableConfig property. + * + * @return + * possible object is + * {@link TableConfig } + * + */ + public TableConfig getTableConfig() { + return tableConfig; + } + + /** + * Sets the value of the tableConfig property. + * + * @param value + * allowed object is + * {@link TableConfig } + * + */ + public void setTableConfig(TableConfig value) { + this.tableConfig = value; + } + +} diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Attribute.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceDetails.java similarity index 69% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Attribute.java rename to components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceDetails.java index 19e177e829..6428bf097f 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Attribute.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceDetails.java @@ -26,15 +26,15 @@ import javax.xml.bind.annotation.XmlValue; /** - *

Java class for Attribute complex type. + *

Java class for DeviceDetails complex type. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <complexType name="Attribute">
+ * <complexType name="DeviceDetails">
  *   <simpleContent>
  *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="table-id" type="{http://www.w3.org/2001/XMLSchema}string" />
  *     </extension>
  *   </simpleContent>
  * </complexType>
@@ -43,11 +43,15 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-public class Attribute {
+@XmlType(name = "DeviceDetails", propOrder = {
+    "value"
+})
+public class DeviceDetails {
 
     @XmlValue
     protected String value;
-
+    @XmlAttribute(name = "table-id")
+    protected String tableId;
 
     /**
      * Gets the value of the value property.
@@ -73,4 +77,28 @@ public class Attribute {
         this.value = value;
     }
 
+    /**
+     * Gets the value of the tableId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTableId() {
+        return tableId;
+    }
+
+    /**
+     * Sets the value of the tableId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTableId(String value) {
+        this.tableId = value;
+    }
+
 }
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceManagementConfiguration.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceManagementConfiguration.java
deleted file mode 100644
index 2491390f5e..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceManagementConfiguration.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *   Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- *   WSO2 Inc. licenses this file to you under the Apache License,
- *   Version 2.0 (the "License"); you may not use this file except
- *   in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied.  See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
- *
- */
-package org.wso2.carbon.device.mgt.extensions.device.type.deployer.config;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 

Java class for DeviceManagementConfiguration complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="DeviceManagementConfiguration">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Device" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="ManagementRepository" type="{}ManagementRepository"/>
- *         <element name="PushNotificationConfiguration" type="{}PushNotificationConfiguration"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ - -//@XmlType(name = "DeviceManagementConfiguration", propOrder = { -// "deviceType", -// "managementRepository", -// "pushNotificationConfiguration" -//}) -@XmlAccessorType(XmlAccessType.FIELD) -@XmlRootElement(name = "DeviceManagementConfiguration") -public class DeviceManagementConfiguration { - - @XmlElement(name = "DeviceType", required = true) - protected String deviceType; - @XmlElement(name = "ManagementRepository", required = true) - protected ManagementRepository managementRepository; - @XmlElement(name = "PushNotificationConfiguration", required = true) - protected PushNotificationConfiguration pushNotificationConfiguration; - - private DeviceManagementConfiguration() { - } - - /** - * Gets the value of the device property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDeviceType() { - return deviceType; - } - - /** - * Sets the value of the device property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDeviceType(String value) { - this.deviceType = value; - } - - /** - * Gets the value of the managementRepository property. - * - * @return - * possible object is - * {@link ManagementRepository } - * - */ - public ManagementRepository getManagementRepository() { - return managementRepository; - } - - /** - * Sets the value of the managementRepository property. - * - * @param value - * allowed object is - * {@link ManagementRepository } - * - */ - public void setManagementRepository(ManagementRepository value) { - this.managementRepository = value; - } - - /** - * Gets the value of the pushNotificationConfiguration property. - * - * @return - * possible object is - * {@link PushNotificationConfiguration } - * - */ - public PushNotificationConfiguration getPushNotificationConfiguration() { - return pushNotificationConfiguration; - } - - /** - * Sets the value of the pushNotificationConfiguration property. - * - * @param value - * allowed object is - * {@link PushNotificationConfiguration } - * - */ - public void setPushNotificationConfiguration(PushNotificationConfiguration value) { - this.pushNotificationConfiguration = value; - } - -} diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceTypeConfiguration.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceTypeConfiguration.java new file mode 100644 index 0000000000..4e8cfc4a88 --- /dev/null +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceTypeConfiguration.java @@ -0,0 +1,240 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.wso2.carbon.device.mgt.extensions.device.type.deployer.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.XmlRootElement; + + +/** + *

Java class for DeviceTypeConfiguration complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="DeviceTypeConfiguration">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="DeviceDetails" type="{}DeviceDetails"/>
+ *         <element name="Features" type="{}Features"/>
+ *         <element name="ProvisioningConfig" type="{}ProvisioningConfig"/>
+ *         <element name="PushNotificationProvider" type="{}PushNotificationProvider"/>
+ *         <element name="License" type="{}License"/>
+ *         <element name="DataSource" type="{}DataSource"/>
+ *       </sequence>
+ *       <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlRootElement(name = "DeviceTypeConfiguration") +public class DeviceTypeConfiguration { + + @XmlElement(name = "DeviceDetails", required = true) + protected DeviceDetails deviceDetails; + @XmlElement(name = "Features", required = true) + protected Features features; + @XmlElement(name = "ProvisioningConfig", required = true) + protected ProvisioningConfig provisioningConfig; + @XmlElement(name = "PushNotificationProvider", required = true) + protected PushNotificationProvider pushNotificationProvider; + @XmlElement(name = "License", required = true) + protected License license; + @XmlElement(name = "DataSource", required = true) + protected DataSource dataSource; + @XmlAttribute(name = "name") + protected String name; + + /** + * Gets the value of the deviceDetails property. + * + * @return + * possible object is + * {@link DeviceDetails } + * + */ + public DeviceDetails getDeviceDetails() { + return deviceDetails; + } + + /** + * Sets the value of the deviceDetails property. + * + * @param value + * allowed object is + * {@link DeviceDetails } + * + */ + public void setDeviceDetails(DeviceDetails value) { + this.deviceDetails = value; + } + + /** + * Gets the value of the features property. + * + * @return + * possible object is + * {@link Features } + * + */ + public Features getFeatures() { + return features; + } + + /** + * Sets the value of the features property. + * + * @param value + * allowed object is + * {@link Features } + * + */ + public void setFeatures(Features value) { + this.features = value; + } + + /** + * Gets the value of the provisioningConfig property. + * + * @return + * possible object is + * {@link ProvisioningConfig } + * + */ + public ProvisioningConfig getProvisioningConfig() { + return provisioningConfig; + } + + /** + * Sets the value of the provisioningConfig property. + * + * @param value + * allowed object is + * {@link ProvisioningConfig } + * + */ + public void setProvisioningConfig(ProvisioningConfig value) { + this.provisioningConfig = value; + } + + /** + * Gets the value of the pushNotificationProvider property. + * + * @return + * possible object is + * {@link PushNotificationProvider } + * + */ + public PushNotificationProvider getPushNotificationProvider() { + return pushNotificationProvider; + } + + /** + * Sets the value of the pushNotificationProvider property. + * + * @param value + * allowed object is + * {@link PushNotificationProvider } + * + */ + public void setPushNotificationProvider(PushNotificationProvider value) { + this.pushNotificationProvider = value; + } + + /** + * Gets the value of the license property. + * + * @return + * possible object is + * {@link License } + * + */ + public License getLicense() { + return license; + } + + /** + * Sets the value of the license property. + * + * @param value + * allowed object is + * {@link License } + * + */ + public void setLicense(License value) { + this.license = value; + } + + /** + * Gets the value of the dataSource property. + * + * @return + * possible object is + * {@link DataSource } + * + */ + public DataSource getDataSource() { + return dataSource; + } + + /** + * Sets the value of the dataSource property. + * + * @param value + * allowed object is + * {@link DataSource } + * + */ + public void setDataSource(DataSource value) { + this.dataSource = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + +} diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Feature.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Feature.java index 00d3768af7..0fd247cddc 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Feature.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Feature.java @@ -20,6 +20,7 @@ package org.wso2.carbon.device.mgt.extensions.device.type.deployer.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.XmlType; @@ -34,10 +35,11 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="Code" type="{http://www.w3.org/2001/XMLSchema}string"/> * <element name="Name" type="{http://www.w3.org/2001/XMLSchema}string"/> * <element name="Description" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="Operation" type="{}Operation"/> * </sequence> + * <attribute name="code" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> * </complexType> @@ -47,89 +49,115 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "Feature", propOrder = { - "code", "name", - "description" + "description", + "operation" }) public class Feature { - @XmlElement(name = "Code", required = true) - protected String code; @XmlElement(name = "Name", required = true) protected String name; @XmlElement(name = "Description", required = true) protected String description; + @XmlElement(name = "Operation", required = true) + protected Operation operation; + @XmlAttribute(name = "code") + protected String code; /** - * Gets the value of the code property. + * Gets the value of the name property. * * @return * possible object is * {@link String } * */ - public String getCode() { - return code; + public String getName() { + return name; } /** - * Sets the value of the code property. + * Sets the value of the name property. * * @param value * allowed object is * {@link String } * */ - public void setCode(String value) { - this.code = value; + public void setName(String value) { + this.name = value; } /** - * Gets the value of the name property. + * Gets the value of the description property. * * @return * possible object is * {@link String } * */ - public String getName() { - return name; + public String getDescription() { + return description; } /** - * Sets the value of the name property. + * Sets the value of the description property. * * @param value * allowed object is * {@link String } * */ - public void setName(String value) { - this.name = value; + public void setDescription(String value) { + this.description = value; } /** - * Gets the value of the description property. + * Gets the value of the operation property. + * + * @return + * possible object is + * {@link Operation } + * + */ + public Operation getOperation() { + return operation; + } + + /** + * Sets the value of the operation property. + * + * @param value + * allowed object is + * {@link Operation } + * + */ + public void setOperation(Operation value) { + this.operation = value; + } + + /** + * Gets the value of the code property. * * @return * possible object is * {@link String } * */ - public String getDescription() { - return description; + public String getCode() { + return code; } /** - * Sets the value of the description property. + * Sets the value of the code property. * * @param value * allowed object is * {@link String } * */ - public void setDescription(String value) { - this.description = value; + public void setCode(String value) { + this.code = value; } } diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Features.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Features.java index 8a84374a63..7e00b18688 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Features.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Features.java @@ -18,13 +18,12 @@ */ package org.wso2.carbon.device.mgt.extensions.device.type.deployer.config; -import java.util.ArrayList; -import java.util.List; 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.XmlType; +import java.util.ArrayList; +import java.util.List; /** @@ -37,9 +36,8 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="Feature" type="{}Feature" maxOccurs="unbounded" minOccurs="0"/> + * <element name="Feature" type="{}Feature"/> * </sequence> - * <attribute name="generate" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> * </complexType> @@ -55,30 +53,14 @@ public class Features { @XmlElement(name = "Feature") protected List feature; - @XmlAttribute(name = "generate") - protected boolean generate; /** * Gets the value of the feature property. * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the feature property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getFeature().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Feature } - * - * + * @return + * possible object is + * {@link Feature } + * */ public List getFeature() { if (feature == null) { @@ -87,28 +69,4 @@ public class Features { return this.feature; } - /** - * Gets the value of the generate property. - * - * @return - * possible object is - * {@link String } - * - */ - public boolean isGenerate() { - return generate; - } - - /** - * Sets the value of the generate property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setGenerate(boolean value) { - this.generate = value; - } - } diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DataSourceConfiguration.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/FormParameters.java similarity index 57% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DataSourceConfiguration.java rename to components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/FormParameters.java index a118ee41ab..6cdda89299 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DataSourceConfiguration.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/FormParameters.java @@ -22,19 +22,21 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import java.util.ArrayList; +import java.util.List; /** - *

Java class for DataSourceConfiguration complex type. + *

Java class for FormParameters complex type. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <complexType name="DataSourceConfiguration">
+ * <complexType name="FormParameters">
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element name="JndiLookupDefinition" type="{}JndiLookupDefinition"/>
+ *         <element name="Parameter" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -44,36 +46,19 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DataSourceConfiguration", propOrder = {
-    "jndiLookupDefinition"
+@XmlType(name = "FormParameters", propOrder = {
+    "parameter"
 })
-public class DataSourceConfiguration {
+public class FormParameters {
 
-    @XmlElement(name = "JndiLookupDefinition", required = true)
-    protected JndiLookupDefinition jndiLookupDefinition;
+    @XmlElement(name = "Parameter")
+    protected List parameter;
 
-    /**
-     * Gets the value of the jndiLookupDefinition property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link JndiLookupDefinition }
-     *     
-     */
-    public JndiLookupDefinition getJndiLookupDefinition() {
-        return jndiLookupDefinition;
-    }
-
-    /**
-     * Sets the value of the jndiLookupDefinition property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link JndiLookupDefinition }
-     *     
-     */
-    public void setJndiLookupDefinition(JndiLookupDefinition value) {
-        this.jndiLookupDefinition = value;
+    public List getParameter() {
+        if (parameter == null) {
+            parameter = new ArrayList();
+        }
+        return this.parameter;
     }
 
 }
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/JndiLookupDefinition.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/JndiConfig.java
similarity index 85%
rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/JndiLookupDefinition.java
rename to components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/JndiConfig.java
index 9064215fe2..a43dc26b9c 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/JndiLookupDefinition.java
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/JndiConfig.java
@@ -25,16 +25,16 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * 

Java class for JndiLookupDefinition complex type. + *

Java class for jndiConfig complex type. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <complexType name="JndiLookupDefinition">
+ * <complexType name="jndiConfig">
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element name="Name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -44,12 +44,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JndiLookupDefinition", propOrder = {
+@XmlType(name = "jndiConfig", propOrder = {
     "name"
 })
-public class JndiLookupDefinition {
+public class JndiConfig {
 
-    @XmlElement(name = "Name", required = true)
+    @XmlElement(required = true)
     protected String name;
 
     /**
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/ManagementRepository.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/ManagementRepository.java
deleted file mode 100644
index c7eccfd5f2..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/ManagementRepository.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *   Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- *   WSO2 Inc. licenses this file to you under the Apache License,
- *   Version 2.0 (the "License"); you may not use this file except
- *   in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied.  See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
- *
- */
-package org.wso2.carbon.device.mgt.extensions.device.type.deployer.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 ManagementRepository complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="ManagementRepository">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="DataSourceConfiguration" type="{}DataSourceConfiguration"/>
- *         <element name="DeviceDefinition" type="{}DeviceDefinition"/>
- *         <element name="ProvisioningConfig" type="{}ProvisioningConfig"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ManagementRepository", propOrder = { - "dataSourceConfiguration", - "deviceDefinition", - "provisioningConfig" -}) -public class ManagementRepository { - - @XmlElement(name = "DataSourceConfiguration", required = true) - protected DataSourceConfiguration dataSourceConfiguration; - @XmlElement(name = "DeviceDefinition", required = true) - protected DeviceDefinition deviceDefinition; - @XmlElement(name = "ProvisioningConfig", required = true) - protected ProvisioningConfig provisioningConfig; - - /** - * Gets the value of the dataSourceConfiguration property. - * - * @return - * possible object is - * {@link DataSourceConfiguration } - * - */ - public DataSourceConfiguration getDataSourceConfiguration() { - return dataSourceConfiguration; - } - - /** - * Sets the value of the dataSourceConfiguration property. - * - * @param value - * allowed object is - * {@link DataSourceConfiguration } - * - */ - public void setDataSourceConfiguration(DataSourceConfiguration value) { - this.dataSourceConfiguration = value; - } - - /** - * Gets the value of the deviceDefinition property. - * - * @return - * possible object is - * {@link DeviceDefinition } - * - */ - public DeviceDefinition getDeviceDefinition() { - return deviceDefinition; - } - - /** - * Sets the value of the deviceDefinition property. - * - * @param value - * allowed object is - * {@link DeviceDefinition } - * - */ - public void setDeviceDefinition(DeviceDefinition value) { - this.deviceDefinition = value; - } - - /** - * Gets the value of the provisioningConfig property. - * - * @return - * possible object is - * {@link ProvisioningConfig } - * - */ - public ProvisioningConfig getProvisioningConfig() { - return provisioningConfig; - } - - /** - * Sets the value of the provisioningConfig property. - * - * @param value - * allowed object is - * {@link ProvisioningConfig } - * - */ - public void setProvisioningConfig(ProvisioningConfig value) { - this.provisioningConfig = value; - } - -} diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/ObjectFactory.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/ObjectFactory.java new file mode 100644 index 0000000000..be089a9ccc --- /dev/null +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/ObjectFactory.java @@ -0,0 +1,198 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.wso2.carbon.device.mgt.extensions.device.type.deployer.config; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.wso2.carbon package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _DeviceTypeConfiguration_QNAME = new QName("", "DeviceTypeConfiguration"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.wso2.carbon + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link DeviceTypeConfiguration } + * + */ + public DeviceTypeConfiguration createDeviceTypeConfiguration() { + return new DeviceTypeConfiguration(); + } + + /** + * Create an instance of {@link Operation } + * + */ + public Operation createOperation() { + return new Operation(); + } + + /** + * Create an instance of {@link Attributes } + * + */ + public Attributes createAttributes() { + return new Attributes(); + } + + /** + * Create an instance of {@link ProvisioningConfig } + * + */ + public ProvisioningConfig createProvisioningConfig() { + return new ProvisioningConfig(); + } + + /** + * Create an instance of {@link TableConfig } + * + */ + public TableConfig createTableConfig() { + return new TableConfig(); + } + + /** + * Create an instance of {@link Table } + * + */ + public Table createTable() { + return new Table(); + } + + /** + * Create an instance of {@link Property } + * + */ + public Property createProperty() { + return new Property(); + } + + /** + * Create an instance of {@link JndiConfig } + * + */ + public JndiConfig createJndiConfig() { + return new JndiConfig(); + } + + /** + * Create an instance of {@link FormParameters } + * + */ + public FormParameters createFormParameters() { + return new FormParameters(); + } + + /** + * Create an instance of {@link Features } + * + */ + public Features createFeatures() { + return new Features(); + } + + /** + * Create an instance of {@link Feature } + * + */ + public Feature createFeature() { + return new Feature(); + } + + /** + * Create an instance of {@link PushNotificationProvider } + * + */ + public PushNotificationProvider createPushNotificationProvider() { + return new PushNotificationProvider(); + } + + /** + * Create an instance of {@link DataSource } + * + */ + public DataSource createDataSource() { + return new DataSource(); + } + + /** + * Create an instance of {@link ConfigProperties } + * + */ + public ConfigProperties createConfigProperties() { + return new ConfigProperties(); + } + + /** + * Create an instance of {@link License } + * + */ + public License createLicense() { + return new License(); + } + + /** + * Create an instance of {@link DeviceDetails } + * + */ + public DeviceDetails createDeviceDetails() { + return new DeviceDetails(); + } + + /** + * Create an instance of {@link QueryParameters } + * + */ + public QueryParameters createQueryParameters() { + return new QueryParameters(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DeviceTypeConfiguration }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "DeviceTypeConfiguration") + public JAXBElement createDeviceTypeConfiguration(DeviceTypeConfiguration value) { + return new JAXBElement(_DeviceTypeConfiguration_QNAME, DeviceTypeConfiguration.class, null, value); + } + +} diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Operation.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Operation.java new file mode 100644 index 0000000000..81ab8fdaf2 --- /dev/null +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Operation.java @@ -0,0 +1,162 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.wso2.carbon.device.mgt.extensions.device.type.deployer.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.XmlType; + + +/** + *

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" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Operation", propOrder = { + "queryParameters", + "formParameters" +}) +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; + + /** + * Gets the value of the queryParameters property. + * + * @return + * possible object is + * {@link QueryParameters } + * + */ + public QueryParameters getQueryParameters() { + return queryParameters; + } + + /** + * Sets the value of the queryParameters property. + * + * @param value + * allowed object is + * {@link QueryParameters } + * + */ + public void setQueryParameters(QueryParameters value) { + this.queryParameters = value; + } + + /** + * Gets the value of the formParameters property. + * + * @return + * possible object is + * {@link FormParameters } + * + */ + public FormParameters getFormParameters() { + return formParameters; + } + + /** + * Sets the value of the formParameters property. + * + * @param value + * allowed object is + * {@link FormParameters } + * + */ + public void setFormParameters(FormParameters value) { + this.formParameters = value; + } + + /** + * Gets the value of the context property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContext() { + return context; + } + + /** + * Sets the value of the context property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContext(String value) { + this.context = value; + } + + /** + * Gets the value of the method property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMethod() { + return method; + } + + /** + * Sets the value of the method property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMethod(String value) { + this.method = value; + } + +} diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/ProvisioningConfig.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/ProvisioningConfig.java index 9b1861e254..e6caf2f562 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/ProvisioningConfig.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/ProvisioningConfig.java @@ -34,7 +34,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="SharedWithAllTenants" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="SharedWithAllTenants" type="{http://www.w3.org/2001/XMLSchema}boolean"/> * </sequence> * </restriction> * </complexContent> @@ -49,16 +49,12 @@ import javax.xml.bind.annotation.XmlType; }) public class ProvisioningConfig { - @XmlElement(name = "SharedWithAllTenants", required = true) + @XmlElement(name = "SharedWithAllTenants") protected boolean sharedWithAllTenants; /** * Gets the value of the sharedWithAllTenants property. * - * @return - * possible object is - * {@link boolean } - * */ public boolean isSharedWithAllTenants() { return sharedWithAllTenants; @@ -67,10 +63,6 @@ public class ProvisioningConfig { /** * Sets the value of the sharedWithAllTenants property. * - * @param value - * allowed object is - * {@link String } - * */ public void setSharedWithAllTenants(boolean value) { this.sharedWithAllTenants = value; diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/PushNotificationConfiguration.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/PushNotificationProvider.java similarity index 59% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/PushNotificationConfiguration.java rename to components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/PushNotificationProvider.java index 0dacc5622d..43aee84397 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/PushNotificationConfiguration.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/PushNotificationProvider.java @@ -20,24 +20,25 @@ package org.wso2.carbon.device.mgt.extensions.device.type.deployer.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.XmlType; /** - *

Java class for PushNotificationConfiguration complex type. + *

Java class for PushNotificationProvider complex type. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <complexType name="PushNotificationConfiguration">
+ * <complexType name="PushNotificationProvider">
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element name="PushNotificationProvider" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="FileBasedProperties" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Properties" type="{}Properties"/>
+ *         <element name="FileBasedProperties" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         <element name="ConfigProperties" type="{}ConfigProperties"/>
  *       </sequence>
+ *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
  *     </restriction>
  *   </complexContent>
  * </complexType>
@@ -46,90 +47,81 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PushNotificationConfiguration", propOrder = {
-    "pushNotificationProvider",
+@XmlType(name = "PushNotificationProvider", propOrder = {
     "fileBasedProperties",
-    "properties"
+    "configProperties"
 })
-public class PushNotificationConfiguration {
+public class PushNotificationProvider {
 
-    @XmlElement(name = "PushNotificationProvider", required = true)
-    protected String pushNotificationProvider;
-    @XmlElement(name = "FileBasedProperties", required = true)
+    @XmlElement(name = "FileBasedProperties")
     protected boolean fileBasedProperties;
-    @XmlElement(name = "Properties", required = true)
-    protected Properties properties;
+    @XmlElement(name = "ConfigProperties", required = true)
+    protected ConfigProperties configProperties;
+    @XmlAttribute(name = "type")
+    protected String type;
 
     /**
-     * Gets the value of the pushNotificationProvider property.
+     * Gets the value of the fileBasedProperties property.
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getPushNotificationProvider() {
-        return pushNotificationProvider;
+    public boolean isFileBasedProperties() {
+        return fileBasedProperties;
     }
 
     /**
-     * Sets the value of the pushNotificationProvider property.
+     * Sets the value of the fileBasedProperties property.
      * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
      */
-    public void setPushNotificationProvider(String value) {
-        this.pushNotificationProvider = value;
+    public void setFileBasedProperties(boolean value) {
+        this.fileBasedProperties = value;
     }
 
     /**
-     * Gets the value of the fileBasedProperties property.
+     * Gets the value of the configProperties property.
      * 
      * @return
      *     possible object is
-     *     {@link String }
+     *     {@link ConfigProperties }
      *     
      */
-    public boolean isFileBasedProperties() {
-        return fileBasedProperties;
+    public ConfigProperties getConfigProperties() {
+        return configProperties;
     }
 
     /**
-     * Sets the value of the fileBasedProperties property.
+     * Sets the value of the configProperties property.
      * 
      * @param value
      *     allowed object is
-     *     {@link String }
+     *     {@link ConfigProperties }
      *     
      */
-    public void setFileBasedProperties(boolean value) {
-        this.fileBasedProperties = value;
+    public void setConfigProperties(ConfigProperties value) {
+        this.configProperties = value;
     }
 
     /**
-     * Gets the value of the properties property.
+     * Gets the value of the type property.
      * 
      * @return
      *     possible object is
-     *     {@link Properties }
+     *     {@link String }
      *     
      */
-    public Properties getProperties() {
-        return properties;
+    public String getType() {
+        return type;
     }
 
     /**
-     * Sets the value of the properties property.
+     * Sets the value of the type property.
      * 
      * @param value
      *     allowed object is
-     *     {@link Properties }
+     *     {@link String }
      *     
      */
-    public void setProperties(Properties value) {
-        this.properties = value;
+    public void setType(String value) {
+        this.type = value;
     }
 
 }
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/QueryParameters.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/QueryParameters.java
new file mode 100644
index 0000000000..0f37d49651
--- /dev/null
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/QueryParameters.java
@@ -0,0 +1,64 @@
+/*
+ *   Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.mgt.extensions.device.type.deployer.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;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 

Java class for QueryParameters complex type. + * + *

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 = { + "parameter" +}) +public class QueryParameters { + + @XmlElement(name = "Parameter") + protected List parameter; + + public List getParameter() { + if (parameter == null) { + parameter = new ArrayList(); + } + return this.parameter; + } + +} diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceDefinition.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Table.java similarity index 60% rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceDefinition.java rename to components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Table.java index e49c3a553b..9cb5a926b3 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceDefinition.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Table.java @@ -20,26 +20,25 @@ package org.wso2.carbon.device.mgt.extensions.device.type.deployer.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.XmlType; /** - *

Java class for DeviceDefinition complex type. + *

Java class for Table complex type. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <complexType name="DeviceDefinition">
+ * <complexType name="Table">
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element name="TableName" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="PrimaryKey" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="Attributes" type="{}Attributes"/>
- *         <element name="License" type="{}License"/>
- *         <element name="Features" type="{}Features"/>
  *       </sequence>
+ *       <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
  *     </restriction>
  *   </complexContent>
  * </complexType>
@@ -48,49 +47,18 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DeviceDefinition", propOrder = {
-    "tableName",
+@XmlType(name = "Table", propOrder = {
     "primaryKey",
-    "attributes",
-    "license",
-    "features"
+    "attributes"
 })
-public class DeviceDefinition {
+public class Table {
 
-    @XmlElement(name = "TableName", required = true)
-    protected String tableName;
     @XmlElement(name = "PrimaryKey", required = true)
     protected String primaryKey;
     @XmlElement(name = "Attributes", required = true)
     protected Attributes attributes;
-    @XmlElement(name = "License", required = true)
-    protected License license;
-    @XmlElement(name = "Features", required = true)
-    protected Features features;
-
-    /**
-     * Gets the value of the tableName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTableName() {
-        return tableName;
-    }
-
-    /**
-     * Sets the value of the tableName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTableName(String value) {
-        this.tableName = value;
-    }
+    @XmlAttribute(name = "name")
+    protected String name;
 
     /**
      * Gets the value of the primaryKey property.
@@ -141,51 +109,27 @@ public class DeviceDefinition {
     }
 
     /**
-     * Gets the value of the license property.
+     * Gets the value of the name property.
      * 
      * @return
      *     possible object is
-     *     {@link License }
-     *     
-     */
-    public License getLicense() {
-        return license;
-    }
-
-    /**
-     * Sets the value of the license property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link License }
-     *     
-     */
-    public void setLicense(License value) {
-        this.license = value;
-    }
-
-    /**
-     * Gets the value of the features property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Features }
+     *     {@link String }
      *     
      */
-    public Features getFeatures() {
-        return features;
+    public String getName() {
+        return name;
     }
 
     /**
-     * Sets the value of the features property.
+     * Sets the value of the name property.
      * 
      * @param value
      *     allowed object is
-     *     {@link Features }
+     *     {@link String }
      *     
      */
-    public void setFeatures(Features value) {
-        this.features = value;
+    public void setName(String value) {
+        this.name = value;
     }
 
 }
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/TableConfig.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/TableConfig.java
new file mode 100644
index 0000000000..c587844033
--- /dev/null
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/TableConfig.java
@@ -0,0 +1,86 @@
+/*
+ *   Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.mgt.extensions.device.type.deployer.config;
+
+import java.util.ArrayList;
+import java.util.List;
+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 tableConfig complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="tableConfig">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Table" type="{}Table" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "tableConfig", propOrder = { + "table" +}) +public class TableConfig { + + @XmlElement(name = "Table") + protected List table; + + /** + * Gets the value of the table property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the table property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getTable().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Table } + * + * + */ + public List

getTable() { + if (table == null) { + table = new ArrayList
(); + } + return this.table; + } + +} diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManager.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManager.java index c52aff0a9d..e0f2d45f10 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManager.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManager.java @@ -20,28 +20,25 @@ package org.wso2.carbon.device.mgt.extensions.device.type.deployer.template; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.common.DeviceManager; -import org.wso2.carbon.device.mgt.common.DeviceTypeIdentifier; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.FeatureManager; import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration; import org.wso2.carbon.device.mgt.common.license.mgt.License; import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException; import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManager; +import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.DeviceDetails; +import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.DeviceTypeConfiguration; +import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.Table; import org.wso2.carbon.device.mgt.extensions.device.type.deployer.util.DeviceTypePluginConstants; -import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.DeviceDefinition; -import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.DeviceManagementConfiguration; import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.Feature; -import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.Features; import org.wso2.carbon.device.mgt.extensions.device.type.deployer.exception.DeviceTypeDeployerFileException; import org.wso2.carbon.device.mgt.extensions.device.type.deployer.exception.DeviceTypeMgtPluginException; import org.wso2.carbon.device.mgt.extensions.device.type.deployer.template.dao.DeviceDAODefinition; import org.wso2.carbon.device.mgt.extensions.device.type.deployer.template.dao.DeviceTypePluginDAOManager; -import org.wso2.carbon.device.mgt.extensions.device.type.deployer.template.feature.AnnotationBasedFeatureManager; import org.wso2.carbon.device.mgt.extensions.device.type.deployer.template.feature.ConfigurationBasedFeatureManager; import org.wso2.carbon.device.mgt.extensions.device.type.deployer.template.util.DeviceTypeUtils; import org.wso2.carbon.device.mgt.extensions.license.mgt.registry.RegistryBasedLicenseManager; @@ -71,61 +68,53 @@ public class DeviceTypeManager implements DeviceManager { private FeatureManager featureManager; public DeviceTypeManager(DeviceTypeConfigIdentifier deviceTypeConfigIdentifier, - DeviceManagementConfiguration deviceManagementConfiguration) { - - int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true); - boolean isSharedWithAllTenants = deviceManagementConfiguration.getManagementRepository().getProvisioningConfig() - .isSharedWithAllTenants(); - DeviceTypeIdentifier deviceTypeIdentifier; + DeviceTypeConfiguration deviceTypeConfiguration) { deviceType = deviceTypeConfigIdentifier.getDeviceType(); - if (isSharedWithAllTenants) { - deviceTypeIdentifier = new DeviceTypeIdentifier(deviceType); - } else { - deviceTypeIdentifier = new DeviceTypeIdentifier(deviceType, tenantId); + if (deviceTypeConfiguration.getFeatures() != null && deviceTypeConfiguration.getFeatures().getFeature() != null ) { + List features = deviceTypeConfiguration.getFeatures().getFeature(); + if (features != null) { + featureManager = new ConfigurationBasedFeatureManager(features); + } } - DeviceDefinition deviceDefinition = deviceManagementConfiguration.getManagementRepository().getDeviceDefinition(); - if (deviceDefinition != null) { - //generate features. - Features featuresList = deviceManagementConfiguration.getManagementRepository().getDeviceDefinition().getFeatures(); - if (featuresList != null) { - if (featuresList.isGenerate()) { - featureManager = new AnnotationBasedFeatureManager(deviceTypeIdentifier); - } else { - List features = deviceDefinition.getFeatures().getFeature(); - if (features != null) { - featureManager = new ConfigurationBasedFeatureManager(features); - } + //add license to registry. + this.licenseManager = new RegistryBasedLicenseManager(); + try { + if (licenseManager.getLicense(deviceType, DeviceTypePluginConstants.LANGUAGE_CODE_ENGLISH_US) == null) { + + if (deviceTypeConfiguration.getLicense() != null) { + License defaultLicense = new License(); + defaultLicense.setLanguage(deviceTypeConfiguration.getLicense().getLanguage()); + defaultLicense.setVersion(deviceTypeConfiguration.getLicense().getVersion()); + defaultLicense.setText(deviceTypeConfiguration.getLicense().getText()); + licenseManager.addLicense(deviceType, defaultLicense); } } + } catch (LicenseManagementException e) { + String msg = "Error occurred while adding default license for " + deviceType + " devices"; + throw new DeviceTypeDeployerFileException(msg, e); + } - //add license to registry. - this.licenseManager = new RegistryBasedLicenseManager(); - try { - if (licenseManager.getLicense(deviceType, DeviceTypePluginConstants.LANGUAGE_CODE_ENGLISH_US) == null) { - - if (deviceDefinition.getLicense() != null) { - License defaultLicense = new License(); - defaultLicense.setLanguage(deviceDefinition.getLicense().getLanguage()); - defaultLicense.setVersion(deviceDefinition.getLicense().getVersion()); - defaultLicense.setText(deviceDefinition.getLicense().getText()); - licenseManager.addLicense(deviceType, defaultLicense); - } - } - } catch (LicenseManagementException e) { - String msg = "Error occurred while adding default license for " + deviceType + " devices"; - throw new DeviceTypeDeployerFileException(msg, e); - } + DeviceDetails deviceDetails = deviceTypeConfiguration.getDeviceDetails(); + if (deviceDetails != null) { //Check whether device dao definition exist. - - String tableName = deviceManagementConfiguration.getManagementRepository().getDeviceDefinition() - .getTableName(); + String tableName = deviceTypeConfiguration.getDeviceDetails().getTableId(); if (tableName != null && !tableName.isEmpty()) { + List
tables = deviceTypeConfiguration.getDataSource().getTableConfig().getTable(); + Table deviceDefinitionTable = null; + for (Table table : tables) { + if (tableName.equals(table.getName())) { + deviceDefinitionTable = table; + break; + } + } + if (deviceDefinitionTable == null) { + throw new DeviceTypeDeployerFileException("Could not find definition for table: " + tableName); + } propertiesExist = true; - DeviceDAODefinition deviceDAODefinition = new DeviceDAODefinition(deviceDefinition); - String datasourceName = deviceManagementConfiguration.getManagementRepository() - .getDataSourceConfiguration().getJndiLookupDefinition().getName(); + DeviceDAODefinition deviceDAODefinition = new DeviceDAODefinition(deviceDefinitionTable); + String datasourceName = deviceTypeConfiguration.getDataSource().getJndiConfig().getName(); if (datasourceName != null && !datasourceName.isEmpty()) { String setupOption = System.getProperty("setup"); if (setupOption != null) { diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManagerService.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManagerService.java index 4d92b73c04..6602141b0e 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManagerService.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManagerService.java @@ -28,9 +28,9 @@ import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry; import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService; -import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.DeviceManagementConfiguration; +import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.DeviceTypeConfiguration; import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.Property; -import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.PushNotificationConfiguration; +import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.PushNotificationProvider; import java.util.HashMap; import java.util.List; @@ -50,11 +50,11 @@ public class DeviceTypeManagerService implements DeviceManagementService { private String type; public DeviceTypeManagerService(DeviceTypeConfigIdentifier deviceTypeConfigIdentifier, - DeviceManagementConfiguration deviceManagementConfiguration) { - this.setProvisioningConfig(deviceTypeConfigIdentifier.getTenantDomain(), deviceManagementConfiguration); - this.deviceManager = new DeviceTypeManager(deviceTypeConfigIdentifier, deviceManagementConfiguration); - this.setType(deviceManagementConfiguration.getDeviceType()); - this.populatePushNotificationConfig(deviceManagementConfiguration.getPushNotificationConfiguration()); + DeviceTypeConfiguration deviceTypeConfiguration) { + this.setProvisioningConfig(deviceTypeConfigIdentifier.getTenantDomain(), deviceTypeConfiguration); + this.deviceManager = new DeviceTypeManager(deviceTypeConfigIdentifier, deviceTypeConfiguration); + this.setType(deviceTypeConfiguration.getName()); + this.populatePushNotificationConfig(deviceTypeConfiguration.getPushNotificationProvider()); } @Override @@ -66,15 +66,14 @@ public class DeviceTypeManagerService implements DeviceManagementService { public void init() throws DeviceManagementException { } - private void populatePushNotificationConfig(PushNotificationConfiguration sourceConfig) { - if (sourceConfig != null) { - if (sourceConfig.isFileBasedProperties()) { + private void populatePushNotificationConfig(PushNotificationProvider pushNotificationProvider) { + if (pushNotificationProvider != null) { + if (pushNotificationProvider.isFileBasedProperties()) { Map staticProps = new HashMap<>(); - for (Property property : sourceConfig.getProperties().getProperty()) { + for (Property property : pushNotificationProvider.getConfigProperties().getProperty()) { staticProps.put(property.getName(), property.getValue()); } - pushNotificationConfig = new PushNotificationConfig(sourceConfig.getPushNotificationProvider(), - staticProps); + pushNotificationConfig = new PushNotificationConfig(pushNotificationProvider.getType(), staticProps); } else { try { PlatformConfiguration deviceTypeConfig = deviceManager.getConfiguration(); @@ -83,7 +82,7 @@ public class DeviceTypeManagerService implements DeviceManagementService { if (configuration.size() > 0) { Map properties = this.getConfigProperty(configuration); pushNotificationConfig = new PushNotificationConfig( - sourceConfig.getPushNotificationProvider(), properties); + pushNotificationProvider.getType(), properties); } } } catch (DeviceManagementException e) { @@ -113,10 +112,13 @@ public class DeviceTypeManagerService implements DeviceManagementService { return pushNotificationConfig; } - private void setProvisioningConfig(String tenantDomain, DeviceManagementConfiguration deviceManagementConfiguration) { - boolean sharedWithAllTenants = deviceManagementConfiguration - .getManagementRepository().getProvisioningConfig().isSharedWithAllTenants(); - provisioningConfig = new ProvisioningConfig(tenantDomain, sharedWithAllTenants); + private void setProvisioningConfig(String tenantDomain, DeviceTypeConfiguration deviceTypeConfiguration) { + if (deviceTypeConfiguration.getProvisioningConfig() != null) { + boolean sharedWithAllTenants = deviceTypeConfiguration.getProvisioningConfig().isSharedWithAllTenants(); + provisioningConfig = new ProvisioningConfig(tenantDomain, sharedWithAllTenants); + } else { + provisioningConfig = new ProvisioningConfig(tenantDomain, false); + } } private void setType(String type) { diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/dao/DeviceDAODefinition.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/dao/DeviceDAODefinition.java index b9be593ecb..4df77a9a2c 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/dao/DeviceDAODefinition.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/dao/DeviceDAODefinition.java @@ -18,8 +18,7 @@ */ package org.wso2.carbon.device.mgt.extensions.device.type.deployer.template.dao; -import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.Attribute; -import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.DeviceDefinition; +import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.Table; import org.wso2.carbon.device.mgt.extensions.device.type.deployer.exception.DeviceTypeDeployerFileException; import java.util.ArrayList; @@ -32,7 +31,7 @@ import java.util.List; public class DeviceDAODefinition { private String deviceTableName; - private String primarkey; + private String primarykey; public List getColumnNames() { return columnNames; @@ -41,26 +40,26 @@ public class DeviceDAODefinition { private List columnNames = new ArrayList<>(); - public DeviceDAODefinition(DeviceDefinition deviceDefinition) { - deviceTableName = deviceDefinition.getTableName(); - primarkey = deviceDefinition.getPrimaryKey(); - List attributes = deviceDefinition.getAttributes().getAttribute(); + public DeviceDAODefinition(Table table) { + deviceTableName = table.getName(); + primarykey = table.getPrimaryKey(); + List attributes = table.getAttributes().getAttribute(); if (deviceTableName == null || deviceTableName.isEmpty()) { throw new DeviceTypeDeployerFileException("Missing deviceTableName"); } - if (primarkey == null || primarkey.isEmpty()) { + if (primarykey == null || primarykey.isEmpty()) { throw new DeviceTypeDeployerFileException("Missing primaryKey "); } if (attributes == null || attributes.size() == 0) { throw new DeviceTypeDeployerFileException("Missing Attributes "); } - for (Attribute attribute : attributes) { - if (attribute.getValue() == null ||attribute.getValue().isEmpty()) { + for (String attribute : attributes) { + if (attribute.isEmpty()) { throw new DeviceTypeDeployerFileException("Unsupported attribute format for device definition"); } - columnNames.add(attribute.getValue()); + columnNames.add(attribute); } } @@ -68,8 +67,8 @@ public class DeviceDAODefinition { return deviceTableName; } - public String getPrimarkey() { - return primarkey; + public String getPrimaryKey() { + return primarykey; } diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/dao/DeviceTypePluginDAO.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/dao/DeviceTypePluginDAO.java index 4840d73fd4..fba1f12193 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/dao/DeviceTypePluginDAO.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/dao/DeviceTypePluginDAO.java @@ -56,7 +56,7 @@ public class DeviceTypePluginDAO { try { conn = deviceTypeDAOHandler.getConnection(); String selectDBQuery = "SELECT " + getDeviceTableColumnNames() + " FROM " + - deviceDAODefinition.getDeviceTableName() + " WHERE " + deviceDAODefinition.getPrimarkey() + " = ?"; + deviceDAODefinition.getDeviceTableName() + " WHERE " + deviceDAODefinition.getPrimaryKey() + " = ?"; stmt = conn.prepareStatement(selectDBQuery); stmt.setString(1, deviceId); resultSet = stmt.executeQuery(); @@ -97,7 +97,7 @@ public class DeviceTypePluginDAO { try { conn = deviceTypeDAOHandler.getConnection(); String createDBQuery = "INSERT INTO " + deviceDAODefinition.getDeviceTableName() + "(" - + deviceDAODefinition.getPrimarkey() + " , " + getDeviceTableColumnNames() + ") VALUES (" + + deviceDAODefinition.getPrimaryKey() + " , " + getDeviceTableColumnNames() + ") VALUES (" + getPreparedInputString(deviceDAODefinition.getColumnNames().size() + 1) + ")"; stmt = conn.prepareStatement(createDBQuery); stmt.setString(1, device.getDeviceIdentifier()); @@ -132,7 +132,7 @@ public class DeviceTypePluginDAO { try { conn = deviceTypeDAOHandler.getConnection(); String updateDBQuery = "UPDATE " + deviceDAODefinition.getDeviceTableName() + " SET " - + getDeviceTableColumnNamesForUpdateQuery()+ " WHERE " + deviceDAODefinition.getPrimarkey() + + getDeviceTableColumnNamesForUpdateQuery()+ " WHERE " + deviceDAODefinition.getPrimaryKey() + " = ?"; stmt = conn.prepareStatement(updateDBQuery); @@ -167,7 +167,7 @@ public class DeviceTypePluginDAO { try { conn = deviceTypeDAOHandler.getConnection(); String deleteDBQuery = "DELETE FROM " + deviceDAODefinition.getDeviceTableName() - + " WHERE " + deviceDAODefinition.getPrimarkey() + " = ?"; + + " WHERE " + deviceDAODefinition.getPrimaryKey() + " = ?"; stmt = conn.prepareStatement(deleteDBQuery); stmt.setString(1, deviceId); int rows = stmt.executeUpdate(); @@ -203,7 +203,7 @@ public class DeviceTypePluginDAO { resultSet = stmt.executeQuery(); while (resultSet.next()) { device = new Device(); - device.setDeviceIdentifier(resultSet.getString(deviceDAODefinition.getPrimarkey())); + device.setDeviceIdentifier(resultSet.getString(deviceDAODefinition.getPrimaryKey())); List properties = new ArrayList<>(); for (String columnName : deviceDAODefinition.getColumnNames()) { Device.Property property = new Device.Property(); diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/feature/AnnotationBasedFeatureManager.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/feature/AnnotationBasedFeatureManager.java deleted file mode 100644 index 8b17957046..0000000000 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/feature/AnnotationBasedFeatureManager.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * Licensed 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.deployer.template.feature; - -import org.wso2.carbon.device.mgt.common.DeviceManagementException; -import org.wso2.carbon.device.mgt.common.DeviceTypeIdentifier; -import org.wso2.carbon.device.mgt.common.Feature; -import org.wso2.carbon.device.mgt.common.FeatureManager; -import org.wso2.carbon.device.mgt.extensions.feature.mgt.GenericFeatureManager; - -import java.util.List; - -/** - * This feature manager implementation reads the annotation @Feature and creates a feature manager. - */ -public class AnnotationBasedFeatureManager implements FeatureManager { - private DeviceTypeIdentifier deviceType; - - public AnnotationBasedFeatureManager(DeviceTypeIdentifier deviceTypeIdentifier) { - this.deviceType = deviceTypeIdentifier; - } - - @Override - public boolean addFeature(Feature feature) throws DeviceManagementException { - return false; - } - - @Override - public boolean addFeatures(List features) throws DeviceManagementException { - return false; - } - - @Override - public Feature getFeature(String name) throws DeviceManagementException { - return GenericFeatureManager.getInstance().getFeature(deviceType, name); - } - - @Override - public List getFeatures() throws DeviceManagementException { - return GenericFeatureManager.getInstance().getFeatures(deviceType); - } - - @Override - public boolean removeFeature(String name) throws DeviceManagementException { - return false; - } - - @Override - public boolean addSupportedFeaturesToDB() throws DeviceManagementException { - return false; - } -} diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/feature/ConfigurationBasedFeatureManager.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/feature/ConfigurationBasedFeatureManager.java index 35689afcec..64303fa206 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/feature/ConfigurationBasedFeatureManager.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/feature/ConfigurationBasedFeatureManager.java @@ -21,15 +21,27 @@ package org.wso2.carbon.device.mgt.extensions.device.type.deployer.template.feat import org.wso2.carbon.device.mgt.common.DeviceManagementException; 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.deployer.config.Operation; +import javax.ws.rs.HttpMethod; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * This implementation retreives the features that are configured through the deployer. */ 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 PATH_PARAMS = "pathParams"; + private static final String QUERY_PARAMS = "queryParams"; + private static final String FORM_PARAMS = "formParams"; + private static final Pattern PATH_PARAM_REGEX = Pattern.compile("\\{(.*?)\\}"); public ConfigurationBasedFeatureManager( List features) { @@ -38,6 +50,29 @@ public class ConfigurationBasedFeatureManager implements FeatureManager { deviceFeature.setCode(feature.getCode()); deviceFeature.setName(feature.getName()); deviceFeature.setDescription(feature.getDescription()); + Operation operation = feature.getOperation(); + if (operation != null) { + Map apiParams = new HashMap<>(); + apiParams.put(METHOD, operation.getMethod().toUpperCase()); + apiParams.put(URI, operation.getContext()); + List pathParams = getPathParams(operation.getContext()); + if (!pathParams.isEmpty()) { + apiParams.put(PATH_PARAMS, pathParams); + } + + if (operation.getQueryParameters() != null) { + apiParams.put(QUERY_PARAMS, operation.getQueryParameters().getParameter()); + } + if (operation.getFormParameters() != null) { + apiParams.put(FORM_PARAMS, operation.getFormParameters().getParameter()); + } + List metadataEntries = new ArrayList<>(); + Feature.MetadataEntry metadataEntry = new Feature.MetadataEntry(); + metadataEntry.setId(-1); + metadataEntry.setValue(apiParams); + metadataEntries.add(metadataEntry); + deviceFeature.setMetadataEntries(metadataEntries); + } this.features.add(deviceFeature); } } @@ -77,4 +112,13 @@ public class ConfigurationBasedFeatureManager implements FeatureManager { public boolean addSupportedFeaturesToDB() throws DeviceManagementException { return false; } + + private List getPathParams(String context) { + List matchList = new ArrayList(); + Matcher regexMatcher = PATH_PARAM_REGEX.matcher(context); + while (regexMatcher.find()) { + matchList.add(regexMatcher.group(1)); + } + return matchList; + } } diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/util/DeviceTypeUtils.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/util/DeviceTypeUtils.java index 2f6d1525b8..466b3edcfe 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/util/DeviceTypeUtils.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/util/DeviceTypeUtils.java @@ -21,7 +21,6 @@ package org.wso2.carbon.device.mgt.extensions.device.type.deployer.template.util import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.DeviceManagementConfiguration; import org.wso2.carbon.device.mgt.extensions.device.type.deployer.exception.DeviceTypeMgtPluginException; import org.wso2.carbon.device.mgt.extensions.device.type.deployer.internal.DeviceTypeManagementDataHolder; import org.wso2.carbon.registry.api.RegistryException; @@ -30,7 +29,6 @@ import org.wso2.carbon.registry.core.Registry; import javax.naming.Context; import javax.naming.InitialContext; -import javax.naming.NamingException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.PreparedStatement; @@ -89,8 +87,6 @@ public class DeviceTypeUtils { } else { log.info("Device management repository database already exists. Not creating a new database."); } - } catch (NamingException e) { - log.error("Error while looking up the data source: " + datasourceName, e); } catch (Exception e) { throw new DeviceTypeMgtPluginException("Error occurred while initializing Device " + "Management database schema", e); diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/sample.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/sample.xml index 7e5a1f9536..1f0584227c 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/sample.xml +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/sample.xml @@ -17,7 +17,65 @@ ~ specific language governing permissions and limitations ~ under the License. --> - + + + + + + + abc + this is a feature + + + deviceId + + + test + + + + + + + + + false + + + + true + + + sample.mqtt.adapter + tcp://localhost:1883 + admin + https://localhost:9443/dynamic-client-web/register + 0 + + true + + en_US @@ -29,49 +87,15 @@ jdbc/SampleDM_DB - -
+ +
SAMPLE_DEVICE_ID column1 column2
- + - - - - abc - 5.0.0 - this is a feature - - place_holder - place_holder - place_holder - - - - - - false - - - - - true - - - sample.mqtt.adapter - tcp://localhost:1883 - admin - https://localhost:9443/dynamic-client-web/register - 0 - - true - - - - - + \ No newline at end of file