Updated Branches: refs/heads/master 21ee8982a -> 8cde67087
Fix ordering of sql commands and set root domain Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8cde6708 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8cde6708 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8cde6708 Branch: refs/heads/master Commit: 8cde670871c6d497930289279a8e4a96cdc7eac7 Parents: 975fc99 Author: Hugo Trippaers <[email protected]> Authored: Sat Sep 22 13:44:33 2012 +0200 Committer: Hugo Trippaers <[email protected]> Committed: Sat Sep 22 13:44:33 2012 +0200 ---------------------------------------------------------------------- developer/pom.xml | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8cde6708/developer/pom.xml ---------------------------------------------------------------------- diff --git a/developer/pom.xml b/developer/pom.xml index 3270977..ed6dd86 100644 --- a/developer/pom.xml +++ b/developer/pom.xml @@ -105,7 +105,7 @@ <executions> <execution> - <id>create-database</id> + <id>drop-database</id> <phase>process-test-resources</phase> <goals> <goal>execute</goal> @@ -115,10 +115,21 @@ <password>${db.cloud.password}</password> <url>jdbc:mysql://${db.cloud.host}:${db.cloud.port}</url> <sqlCommand>drop database if exists `cloud`</sqlCommand> - <sqlCommand>create database `cloud`</sqlCommand> - <!-- <onError>continue</onError> --> </configuration> </execution> + <execution> + <id>create-database</id> + <phase>process-test-resources</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <username>root</username> + <password>${db.cloud.password}</password> + <url>jdbc:mysql://${db.cloud.host}:${db.cloud.port}</url> + <sqlCommand>create database `cloud`</sqlCommand> + </configuration> + </execution> <execution> <id>create-schema</id> <phase>process-test-resources</phase> @@ -133,6 +144,16 @@ </srcFiles> </configuration> </execution> + <execution> + <id>prefill-schema</id> + <phase>process-test-resources</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <sqlCommand>INSERT INTO `cloud`.`domain` (id, name, parent, path, owner) VALUES (1, 'ROOT', NULL, '/', 2)</sqlCommand> + </configuration> + </execution> </executions> </plugin> </plugins>
