From 16a8e63497b8430a6168485dbde4901f955f97ae Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Tue, 15 Mar 2016 13:58:16 +0530
Subject: [PATCH] Merge branch 'master' of
 https://github.com/charithag/product-iot-server

# Conflicts:
#	modules/samples/doormanager/component/pom.xml
---
 modules/samples/doormanager/component/pom.xml   | 14 +++++++-------
 modules/tools/cdmf-devicetype-archetype/pom.xml |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/samples/doormanager/component/pom.xml b/modules/samples/doormanager/component/pom.xml
index 2ac2a942..411ca15a 100644
--- a/modules/samples/doormanager/component/pom.xml
+++ b/modules/samples/doormanager/component/pom.xml
@@ -273,11 +273,11 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-  <modules>
-    <module>plugin</module>
-    <module>controller</module>
-    <module>manager</module>
-    <module>analytics</module>
-    <module>ui</module>
-  </modules>
+    <modules>
+        <module>plugin</module>
+        <module>controller</module>
+        <module>manager</module>
+        <module>analytics</module>
+        <module>ui</module>
+    </modules>
 </project>
diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml
index ccef2c78..b39c8ab4 100644
--- a/modules/tools/cdmf-devicetype-archetype/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.wso2.iot</groupId>
-        <artifactId>wso2iot-parent</artifactId>
+        <artifactId>wso2cdmf-tools</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>