Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server

modules/samples/installer/device-deployer.xml

@@ -32,7 +32,7 @@
     <url>http://wso2.org</url>
 
     <modules>
-        <!-- maven module of your device-type -->
+        <!-- STEP#1 ADD THE LOCATION OF YOUR DEVICE-TYPE -->
         <module>samples/connectedcup</module>
         <module>samples/currentsensor</module>
     </modules>
@@ -43,7 +43,6 @@
                 <groupId>org.wso2.maven</groupId>
                 <artifactId>carbon-p2-plugin</artifactId>
                 <version>1.5.3</version>
-
                 <executions>
                     <execution>
                         <id>2-p2-repo-generation</id>
@@ -59,7 +58,7 @@
 
                             <featureArtifacts>
                                 <featureArtifactDef>
-                                    <!-- STEP#1. ADD YOUR DEVICE TYPE FEATURE HERE  "< GROUP_ID:ARTIFACT_ID:VERSION >" -->
+                                    <!-- STEP#2. ADD YOUR DEVICE TYPE FEATURE HERE  "< GROUP_ID:ARTIFACT_ID:VERSION >" -->
                                     org.wso2.carbon.devicemgt-plugins:org.coffeeking.connectedcup.feature:2.0.4-SNAPSHOT
                                 </featureArtifactDef>
                                 <featureArtifactDef>
@@ -89,7 +88,7 @@
                             <destination>repository/components</destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
-                                <!-- STEP#2. ADD YOUR DEVICE TYPE FEATURE GROUP HERE  "<ARTIFACT_ID>.group" -->
+                                <!-- STEP#3. ADD YOUR DEVICE TYPE FEATURE GROUP HERE  "<ARTIFACT_ID>.group" -->
                                 <feature>
                                     <id>org.coffeeking.connectedcup.feature.group</id>
                                     <version>2.0.4-SNAPSHOT</version>

modules/tools/cdmf-devicetype-archetype/README.md

@@ -1,16 +1,18 @@
 # cdmf-devicetype-archetype
 
 To install this maven archetype 
-     go to this folder cdmf-devicetype-archetype 
+     
+go to this folder `cdmf-devicetype-archetype` 
        
      mvn clean install
 
 To create new project
-     go to this folder /wso2iots-1.0.0-SNAPSHOT/samples
+
+go to this folder `/wso2iots-1.0.0-SNAPSHOT/samples`
      
      mvn archetype:generate -DarchetypeCatalog=local
      
-Then select the cdmf.devicetype:cdmf-devicetype-archetype as new archetype. Then you need to provide groupId, artifactId,
+Then select the `cdmf.devicetype:cdmf-devicetype-archetype` as new archetype. Then you need to provide groupId, artifactId,
 version, packaging, name of your device type and name for sensor as shown bellow.
 
        Choose a number or apply filter (format: [groupId:]artifactId, case sensitive contains): : 3
@@ -30,7 +32,12 @@ version, packaging, name of your device type and name for sensor as shown bellow
        
        
 To install sample app into IOTS
-   open '`device-deployer.xml` which is located in wso2iots-1.0.0-SNAPSHOT directory
+   open `device-deployer.xml` which is located in wso2iots-1.0.0-SNAPSHOT directory
+
+Under modules tag add name of sample which you created as module
+           
+           <module>samples/safeLocker</module>
+
 Under featureArtifacts tag add feature artifact definition as below
          
           <featureArtifactDef>
@@ -44,6 +51,9 @@ To install sample app into IOTS
                <version>1.0.0-SNAPSHOT</version>
           </feature>
               
+Finally to deploy sample device type into IoT Server       
+   
            mvn clean install -f device-deployer.xml
            
+Note: This command should be executed place where `device-deployer.xml` is located            
 

modules/tools/cdmf-devicetype-archetype/pom.xml

@@ -28,8 +28,8 @@
     <groupId>cdmf.devicetype</groupId>
     <artifactId>cdmf-devicetype-archetype</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <name>Archetype of WSO2 CDMF Device Type</name>
-    <description>Archetype of WSO2 CDMF Device Type</description>
+    <name>WSO2 CDMF Device Type Archetype</name>
+    <description>WSO2 CDMF Device Type Archetype</description>
     <packaging>maven-archetype</packaging>
     <organization>
         <name>WSO2 Inc.</name>