You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/24 19:29:54 UTC
[17/20] git commit: Fix ordering of sql commands and set root domain
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/0b874f85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0b874f85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0b874f85
Branch: refs/heads/4.0
Commit: 0b874f85de749a62f39547fff583853fb64d1834
Parents: 503ccb0
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Sat Sep 22 13:44:33 2012 +0200
Committer: Edison Su <su...@gmail.com>
Committed: Mon Sep 24 10:06:36 2012 -0700
----------------------------------------------------------------------
developer/pom.xml | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0b874f85/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>