From 74164043074f0f8664f6c51eed69d7e4d1c09a42 Mon Sep 17 00:00:00 2001
From: NuwanSameera <nuwansameera74@gmail.com>
Date: Mon, 14 Dec 2015 12:51:59 +0530
Subject: [PATCH 1/3] pom file changes

---
 modules/distribution/pom.xml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index c7828d37..a2aa0cc2 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -259,6 +259,39 @@
                             </tasks>
                         </configuration>
                     </execution>
+
+                    <execution>
+                        <!-- Creating Digital Display Plugin Management schema -->
+                        <id>create-digitaldisplay-plugin-mgt-schema</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <echo message="########### Create Digital Display plugin Management H2 Schema ###########"/>
+                                <property name="db.dir"
+                                          value="target/wso2carbon-core-${carbon.kernel.version}/repository/database"/>
+                                <property name="userid" value="wso2carbon"/>
+                                <property name="password" value="wso2carbon"/>
+                                <property name="dbURL"
+                                          value="jdbc:h2:file:${basedir}/${db.dir}/DigitalDisplayDM_DB;DB_CLOSE_ON_EXIT=FALSE"/>
+
+                                <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}"
+                                     password="${password}"
+                                     autocommit="true" onerror="continue">
+                                    <classpath refid="maven.dependency.classpath"/>
+                                    <classpath refid="maven.compile.classpath"/>
+                                    <classpath refid="maven.runtime.classpath"/>
+
+                                    <fileset
+                                            file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/digitaldisplay/h2.sql"/>
+                                </sql>
+                                <echo message="##################### END ####################"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+
                     <!--<execution>-->
                     <!--&lt;!&ndash; Creating IDP Management schema &ndash;&gt;-->
                     <!--<id>create-idp-mgt-schema</id>-->

From 72fef2a2cc143f32327b1fc789bdc1432d0e8b43 Mon Sep 17 00:00:00 2001
From: NuwanSameera <nuwansameera74@gmail.com>
Date: Mon, 14 Dec 2015 18:35:09 +0530
Subject: [PATCH 2/3] Merge remote-tracking branch 'upstream/master'

Conflicts:
	modules/distribution/pom.xml
---
 modules/distribution/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 0c99c6f0..0ded64d2 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -447,6 +447,7 @@
                                 <!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
                                     <patternset>
                                         <exclude name="**/shindig.properties" />
+d                                        <exclude name="**/shindig.properties" />
                                     </patternset>
                                 </unzip>
                                 <copy file="src/repository/conf/shindig.properties" todir="${jardir}/shindig-common-${shindig.version}" />

From 727ea9d5c105c13e667e0a76655fd4aae5390565 Mon Sep 17 00:00:00 2001
From: NuwanSameera <nuwansameera74@gmail.com>
Date: Tue, 15 Dec 2015 12:22:57 +0530
Subject: [PATCH 3/3] rename digitaldisplay to digital_display

---
 modules/distribution/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index a92ceb28..040df27d 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -315,7 +315,7 @@
                                     <classpath refid="maven.runtime.classpath"/>
 
                                     <fileset
-                                            file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/digitaldisplay/h2.sql"/>
+                                            file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/digital_display/h2.sql"/>
                                 </sql>
                                 <echo message="##################### END ####################"/>
                             </tasks>