From e01a7fe2d865256c37d93fece578219c7265d8ca Mon Sep 17 00:00:00 2001
From: Shabirmean <shabir_tck09@hotmail.com>
Date: Mon, 4 Jan 2016 18:48:17 +0530
Subject: [PATCH] Moved DB Creation for Android and Windows to feature from
 product pom

---
 modules/distribution/pom.xml              | 63 -----------------------
 modules/distribution/src/assembly/bin.xml | 53 ++++++++++++-------
 2 files changed, 35 insertions(+), 81 deletions(-)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 4cc4049c..cf5ed6e5 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -161,69 +161,6 @@
 							</tasks>
 						</configuration>
 					</execution>
-					<execution>
-						<!-- Creating Android Mobile Plugin Management schema -->
-						<id>create-mobile-android-plugin-mgt-schema</id>
-						<phase>package</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-								<echo message="########### Create ANDROID Mobile 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}/WSO2MobileAndroid_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/android/h2.sql"/>
-								</sql>
-								<echo message="##################### END ####################"/>
-							</tasks>
-						</configuration>
-					</execution>
-					<execution>
-						<!-- Creating Windows Mobile Plugin Management schema -->
-						<id>create-mobile-windows-plugin-mgt-schema</id>
-						<phase>package</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-								<echo message="########### Create WINDOWS Mobile 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}/WSO2MobileWindows_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/windows/h2.sql"/>
-								</sql>
-								<echo message="##################### END ####################"/>
-							</tasks>
-						</configuration>
-					</execution>
 
 					<execution>
 						<!-- Creating API Management schema -->
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 583601b8..6160ff53 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -596,6 +596,22 @@
                 <include>**/*</include>
             </includes>
         </fileSet>
+
+
+        <!-- Copying temporary patches from DAS that fixes JIRA DAS-339 and a Concurrent DB Access Issue -->
+                        <!-- Can be safely removed upon a DAS release with these fixes -->
+        <fileSet>
+            <directory>
+                src/repository/patches
+            </directory>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/components/patches
+            </outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+
     </fileSets>
 
 
@@ -1070,25 +1086,26 @@
             <fileMode>644</fileMode>
         </file>
 
-        <!--&lt;!&ndash; Copying MOBILE-ANDROID H2 database &ndash;&gt;-->
-        <!--<file>-->
-            <!--<source>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileAndroid_DB.h2.db-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
-            <!--<destName>WSO2MobileAndroid_DB.h2.db</destName>-->
-            <!--<fileMode>644</fileMode>-->
-        <!--</file>-->
 
-        <!--&lt;!&ndash; Copying MOBILE-WINDOWS H2 database &ndash;&gt;-->
-        <!--<file>-->
-            <!--<source>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
-            <!--<destName>WSO2MobileAndroid_DB.h2.db</destName>-->
-            <!--<fileMode>644</fileMode>-->
-        <!--</file>-->
+        <!-- Copying MOBILE-ANDROID H2 database -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileAndroid_DB.h2.db
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <destName>WSO2MobileAndroid_DB.h2.db</destName>
+            <fileMode>644</fileMode>
+        </file>
+
+        <!-- Copying MOBILE-WINDOWS H2 database -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <destName>WSO2MobileWindows_DB.h2.db</destName>
+            <fileMode>644</fileMode>
+        </file>
 
         <file>
             <source>src/repository/conf/carbon.xml