community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #58 from Shabirmean/master

Browse Source 
Moved DB Creation for Android and Windows to feature from product pom
merge-requests/1/head
Shabir Mohamed 9 years ago
parent 94dcaa82d8 e01a7fe2d8
commit 5b48a66798
2 changed files with 35 additions and 81 deletions
Show Stats Download Patch File Download Diff File

63
modules/distribution/pom.xml
Unescape View File

@ -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 -->

53
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save