add sql scripts from carbon core and patch01
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5bc41d19 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5bc41d19 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5bc41d19 Branch: refs/heads/master Commit: 5bc41d19be99f8bc1247e0a1339995a9a2b8079b Parents: 5097178 Author: Udara Liyanage <[email protected]> Authored: Tue May 19 12:03:57 2015 +0530 Committer: Udara Liyanage <[email protected]> Committed: Tue May 19 12:49:21 2015 +0530 ---------------------------------------------------------------------- .../modules/distribution/src/assembly/bin.xml | 34 ++++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5bc41d19/products/stratos/modules/distribution/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml b/products/stratos/modules/distribution/src/assembly/bin.xml index f74794a..22df548 100755 --- a/products/stratos/modules/distribution/src/assembly/bin.xml +++ b/products/stratos/modules/distribution/src/assembly/bin.xml @@ -45,8 +45,8 @@ <exclude>**/log4j.properties</exclude> <exclude>**/repository/components/**</exclude> <exclude>**/lib/endorsed/**</exclude> - <exclude>**/dbscripts/mysql.sql</exclude> <exclude>**/repository/conf/security/cipher-tool.properties</exclude> + <exclude>**/dbscripts/**</exclude> <exclude>**/repository/conf/security/cipher-text.properties</exclude> <exclude>**/repository/conf/axis2/axis2.xml</exclude> <exclude>**/repository/conf/registry.xml</exclude> @@ -344,13 +344,29 @@ <include>**/*.war</include> </includes> </fileSet> - <fileSet> + + <fileSet> <directory>../../resources/cloud-services-icons/target/</directory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory> <includes> <include>**/*.war</include> </includes> </fileSet> + + <fileSet> + <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/registry/</outputDirectory> + <excludes> + <exclude>**/identity/**</exclude> + <!-- new version of mysql.sql and db2.sql is coming from WSO2-CARBON-PATCH-4.2.0-0001 patch. So excluding them--> + <exclude>mysql.sql</exclude> + <exclude>db2.sql</exclude> + </excludes> + <includes> + <include>**/**.sql</include> + </includes> + </fileSet> + <fileSet> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/</directory> <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/identity</outputDirectory> @@ -359,6 +375,14 @@ </includes> </fileSet> + <fileSet> + <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/registry</outputDirectory> + <includes> + <include>**/**.sql</include> + </includes> + </fileSet> + <!-- copy cxf runtime --> <fileSet> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes</directory> @@ -449,10 +473,12 @@ <include>**/patch0008/*.*</include> </includes> </fileSet> +<!-- <fileSet> <directory>../../dbscripts/</directory> <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory> </fileSet> +--> <fileSet> <directory>../../payload</directory> <includes> @@ -983,11 +1009,13 @@ </file> <!--Copying config files from kernel patches --> +<!-- <file> <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts/mysql.sql</source> - <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory> + <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/registry</outputDirectory> <filtered>true</filtered> </file> +--> <file> <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-text.properties</source> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory>
