Device Template: add skin shape property to xsd file

- add skin shape property
- change version type to double from string

Change-Id: I019f8e3be9593bab3aa3a02a9414e0531452a545
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>

diff --git a/jaxb_src/org/tizen/emulator/manager/device/xml/template/AdditionalDevices.java b/jaxb_src/org/tizen/emulator/manager/device/xml/template/AdditionalDevices.java
index 7779922..0f94eb4 100644 (file)
--- a/jaxb_src/org/tizen/emulator/manager/device/xml/template/AdditionalDevices.java
+++ b/jaxb_src/org/tizen/emulator/manager/device/xml/template/AdditionalDevices.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.10.01 at 01:53:38 PM KST 
+// Generated on: 2015.10.13 at 11:53:34 AM KST 
 //
 
 

diff --git a/jaxb_src/org/tizen/emulator/manager/device/xml/template/BaseInformation.java b/jaxb_src/org/tizen/emulator/manager/device/xml/template/BaseInformation.java
index e87f85e..049d413 100644 (file)
--- a/jaxb_src/org/tizen/emulator/manager/device/xml/template/BaseInformation.java
+++ b/jaxb_src/org/tizen/emulator/manager/device/xml/template/BaseInformation.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.10.01 at 01:53:38 PM KST 
+// Generated on: 2015.10.13 at 11:53:34 AM KST 
 //
 
 
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlType;
  *         &lt;element name="type" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         &lt;element name="profile" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         &lt;element name="extension" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="version" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="version" type="{http://www.w3.org/2001/XMLSchema}double"/>
  *         &lt;element name="priority" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
  *         &lt;element name="manufacturer" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *       &lt;/sequence>
@@ -58,8 +58,7 @@ public class BaseInformation {
     @XmlElement(required = true)
     protected String profile;
     protected String extension;
-    @XmlElement(required = true)
-    protected String version;
+    protected double version;
     protected Integer priority;
     protected String manufacturer;
 
@@ -162,24 +161,16 @@ public class BaseInformation {
     /**
      * Gets the value of the version property.
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getVersion() {
+    public double getVersion() {
         return version;
     }
 
     /**
      * Sets the value of the version property.
      * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
      */
-    public void setVersion(String value) {
+    public void setVersion(double value) {
         this.version = value;
     }
 

diff --git a/jaxb_src/org/tizen/emulator/manager/device/xml/template/Cpu.java b/jaxb_src/org/tizen/emulator/manager/device/xml/template/Cpu.java
index 448f9a9..11c289f 100644 (file)
--- a/jaxb_src/org/tizen/emulator/manager/device/xml/template/Cpu.java
+++ b/jaxb_src/org/tizen/emulator/manager/device/xml/template/Cpu.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.10.01 at 01:53:38 PM KST 
+// Generated on: 2015.10.13 at 11:53:34 AM KST 
 //
 
 

diff --git a/jaxb_src/org/tizen/emulator/manager/device/xml/template/Device.java b/jaxb_src/org/tizen/emulator/manager/device/xml/template/Device.java
index 1dd7995..3999941 100644 (file)
--- a/jaxb_src/org/tizen/emulator/manager/device/xml/template/Device.java
+++ b/jaxb_src/org/tizen/emulator/manager/device/xml/template/Device.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.10.01 at 01:53:38 PM KST 
+// Generated on: 2015.10.13 at 11:53:34 AM KST 
 //
 
 

diff --git a/jaxb_src/org/tizen/emulator/manager/device/xml/template/DeviceConfiguration.java b/jaxb_src/org/tizen/emulator/manager/device/xml/template/DeviceConfiguration.java
index e35f036..b98c7e1 100644 (file)
--- a/jaxb_src/org/tizen/emulator/manager/device/xml/template/DeviceConfiguration.java
+++ b/jaxb_src/org/tizen/emulator/manager/device/xml/template/DeviceConfiguration.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.10.01 at 01:53:38 PM KST 
+// Generated on: 2015.10.13 at 11:53:34 AM KST 
 //
 
 

diff --git a/jaxb_src/org/tizen/emulator/manager/device/xml/template/DeviceItem.java b/jaxb_src/org/tizen/emulator/manager/device/xml/template/DeviceItem.java
index a5c124f..1e46b75 100644 (file)
--- a/jaxb_src/org/tizen/emulator/manager/device/xml/template/DeviceItem.java
+++ b/jaxb_src/org/tizen/emulator/manager/device/xml/template/DeviceItem.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.10.01 at 01:53:38 PM KST 
+// Generated on: 2015.10.13 at 11:53:34 AM KST 
 //
 
 

diff --git a/jaxb_src/org/tizen/emulator/manager/device/xml/template/DeviceItemValue.java b/jaxb_src/org/tizen/emulator/manager/device/xml/template/DeviceItemValue.java
index a1d20ac..8fdd901 100644 (file)
--- a/jaxb_src/org/tizen/emulator/manager/device/xml/template/DeviceItemValue.java
+++ b/jaxb_src/org/tizen/emulator/manager/device/xml/template/DeviceItemValue.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.10.01 at 01:53:38 PM KST 
+// Generated on: 2015.10.13 at 11:53:34 AM KST 
 //
 
 

diff --git a/jaxb_src/org/tizen/emulator/manager/device/xml/template/DeviceValue.java b/jaxb_src/org/tizen/emulator/manager/device/xml/template/DeviceValue.java
index 5abb50f..692d558 100644 (file)
--- a/jaxb_src/org/tizen/emulator/manager/device/xml/template/DeviceValue.java
+++ b/jaxb_src/org/tizen/emulator/manager/device/xml/template/DeviceValue.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.10.01 at 01:53:38 PM KST 
+// Generated on: 2015.10.13 at 11:53:34 AM KST 
 //
 
 

diff --git a/jaxb_src/org/tizen/emulator/manager/device/xml/template/Display.java b/jaxb_src/org/tizen/emulator/manager/device/xml/template/Display.java
index 28a137c..a5c329a 100644 (file)
--- a/jaxb_src/org/tizen/emulator/manager/device/xml/template/Display.java
+++ b/jaxb_src/org/tizen/emulator/manager/device/xml/template/Display.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.10.01 at 01:53:38 PM KST 
+// Generated on: 2015.10.13 at 11:53:34 AM KST 
 //
 
 
@@ -61,6 +61,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  *                   &lt;element name="path" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *                 &lt;/sequence>
  *                 &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 &lt;attribute name="shape" type="{http://www.w3.org/2001/XMLSchema}string" />
  *               &lt;/restriction>
  *             &lt;/complexContent>
  *           &lt;/complexType>
@@ -312,6 +313,7 @@ public class Display {
      *         &lt;element name="path" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
      *       &lt;/sequence>
      *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       &lt;attribute name="shape" type="{http://www.w3.org/2001/XMLSchema}string" />
      *     &lt;/restriction>
      *   &lt;/complexContent>
      * &lt;/complexType>
@@ -328,6 +330,8 @@ public class Display {
         protected String path;
         @XmlAttribute(name = "name", required = true)
         protected String name;
+        @XmlAttribute(name = "shape")
+        protected String shape;
 
         /**
          * Gets the value of the path property.
@@ -377,6 +381,30 @@ public class Display {
             this.name = value;
         }
 
+        /**
+         * Gets the value of the shape property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link String }
+         *     
+         */
+        public String getShape() {
+            return shape;
+        }
+
+        /**
+         * Sets the value of the shape property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link String }
+         *     
+         */
+        public void setShape(String value) {
+            this.shape = value;
+        }
+
     }
 
 }

diff --git a/jaxb_src/org/tizen/emulator/manager/device/xml/template/ObjectFactory.java b/jaxb_src/org/tizen/emulator/manager/device/xml/template/ObjectFactory.java
index 36610d1..596fbef 100644 (file)
--- a/jaxb_src/org/tizen/emulator/manager/device/xml/template/ObjectFactory.java
+++ b/jaxb_src/org/tizen/emulator/manager/device/xml/template/ObjectFactory.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.10.01 at 01:53:38 PM KST 
+// Generated on: 2015.10.13 at 11:53:34 AM KST 
 //
 
 

diff --git a/jaxb_src/org/tizen/emulator/manager/device/xml/template/Ram.java b/jaxb_src/org/tizen/emulator/manager/device/xml/template/Ram.java
index 76f3923..3e4abbe 100644 (file)
--- a/jaxb_src/org/tizen/emulator/manager/device/xml/template/Ram.java
+++ b/jaxb_src/org/tizen/emulator/manager/device/xml/template/Ram.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.10.01 at 01:53:38 PM KST 
+// Generated on: 2015.10.13 at 11:53:34 AM KST 
 //
 
 

diff --git a/jaxb_src/org/tizen/emulator/manager/device/xml/template/package-info.java b/jaxb_src/org/tizen/emulator/manager/device/xml/template/package-info.java
index c16a0f3..bfd28ea 100644 (file)
--- a/jaxb_src/org/tizen/emulator/manager/device/xml/template/package-info.java
+++ b/jaxb_src/org/tizen/emulator/manager/device/xml/template/package-info.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.10.01 at 01:53:38 PM KST 
+// Generated on: 2015.10.13 at 11:53:34 AM KST 
 //
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.tizen.org/template", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)

diff --git a/xsd/device-template.xsd b/xsd/device-template.xsd
index d80d533..994bb13 100644 (file)
--- a/xsd/device-template.xsd
+++ b/xsd/device-template.xsd
@@ -20,7 +20,7 @@
                        <element name="type" type="string" minOccurs="1" maxOccurs="1" />
                        <element name="profile" type="string" minOccurs="1" maxOccurs="1" />
                        <element name="extension" type="string" minOccurs="0" maxOccurs="1" />
-                       <element name="version" type="string" minOccurs="1" maxOccurs="1" />
+                       <element name="version" type="double" minOccurs="1" maxOccurs="1" />
                        <element name="priority" type="int" minOccurs="0" maxOccurs="1" />
                        <element name="manufacturer" type="string" minOccurs="0" maxOccurs="1" />
                </sequence>
@@ -75,6 +75,7 @@
                                                <element name="path" type="string" minOccurs="0" />
                                        </sequence>
                                        <attribute name="name" type="string" use="required" />
+                                       <attribute name="shape" type="string" use="optional" />
                                </complexType>
                        </element>
                </sequence>