From 93024c81040692bd70741f640dab828f6c79a71d Mon Sep 17 00:00:00 2001 From: Edison Su Date: Tue, 9 Oct 2012 01:14:09 -0700 Subject: [PATCH] fix some pom xml files indentation, add db.root.passowrd, add utils/conf/db.properties.override, add to create user cloud, add devcloud pom file --- developer/pom.xml | 565 ++++++++++++++++++++++++----------------- pom.xml | 1 + tools/devcloud/pom.xml | 73 ++++++ 3 files changed, 405 insertions(+), 234 deletions(-) create mode 100644 tools/devcloud/pom.xml diff --git a/developer/pom.xml b/developer/pom.xml index eb6e11234c8..74edeaddd83 100644 --- a/developer/pom.xml +++ b/developer/pom.xml @@ -1,238 +1,335 @@ - - 4.0.0 - cloud-developer - Apache CloudStack Developer Tools - pom - - org.apache.cloudstack - cloudstack - 4.1.0-SNAPSHOT - - - - mysql - mysql-connector-java - 5.1.21 - runtime - - - - install - + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific + language governing permissions and limitations under the License. --> + + 4.0.0 + cloud-developer + Apache CloudStack Developer Tools + pom + + org.apache.cloudstack + cloudstack + 4.1.0-SNAPSHOT + + + + mysql + mysql-connector-java + 5.1.21 + runtime + + + + install + - - - deploydb - - - deploydb - - - - - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - - - initialize - - read-project-properties - - - - ${project.parent.basedir}/utils/conf/db.properties - - - - - - - maven-antrun-plugin - 1.7 - - - generate-resources - - run - - - - - - - - - - - - - - - - - - - - org.codehaus.mojo - sql-maven-plugin - 1.5 - - - - mysql - mysql-connector-java - ${cs.mysql.version} - - - - org.gjt.mm.mysql.Driver - jdbc:mysql://${db.cloud.host}:${db.cloud.port}/cloud - ${db.cloud.username} - ${db.cloud.password} - - ${maven.test.skip} - true - - - - - drop-database - process-test-resources - - execute - - - root - ${db.cloud.password} - jdbc:mysql://${db.cloud.host}:${db.cloud.port} - drop database if exists `cloud` - - - - create-database - process-test-resources - - execute - - - root - ${db.cloud.password} - jdbc:mysql://${db.cloud.host}:${db.cloud.port} - create database `cloud` - - - - drop-database-usage - process-test-resources - - execute - - - root - ${db.cloud.password} - jdbc:mysql://${db.cloud.host}:${db.cloud.port} - drop database if exists `cloud_usage` - - - - create-database-usage - process-test-resources - - execute - - - root - ${db.cloud.password} - jdbc:mysql://${db.cloud.host}:${db.cloud.port} - create database `cloud_usage` - - - - drop-database-cloudbridge - process-test-resources - - execute - - - root - ${db.cloud.password} - jdbc:mysql://${db.cloud.host}:${db.cloud.port} - drop database if exists `cloudbridge` - - - - create-database-cloudbridge - process-test-resources - - execute - - - root - ${db.cloud.password} - jdbc:mysql://${db.cloud.host}:${db.cloud.port} - create database `cloudbridge` - - - - create-schema - process-test-resources - - execute - - - - ${basedir}/target/db/create-schema.sql - ${basedir}/target/db/create-schema-premium.sql - ${basedir}/target/db/templates.sql - ${basedir}/target/db/create-index-fk.sql - ${basedir}/target/db/cloudbridge_schema.sql - ${basedir}/target/db/cloudbridge_multipart.sql - ${basedir}/target/db/cloudbridge_index.sql - ${basedir}/target/db/cloudbridge_multipart_alter.sql - ${basedir}/target/db/cloudbridge_bucketpolicy.sql - ${basedir}/target/db/cloudbridge_policy_alter.sql - ${basedir}/target/db/cloudbridge_offering.sql - ${basedir}/target/db/cloudbridge_offering_alter.sql - - - - - prefill-schema - process-test-resources - - execute - - - INSERT INTO `cloud`.`domain` (id, name, parent, path, owner) VALUES (1, 'ROOT', NULL, '/', 2) - - - - prefill-configuration - process-test-resources - - execute - - - INSERT INTO `cloud`.`configuration` (category, instance, component, name, value) VALUES ('Hidden', 'DEFAULT', 'management-server', 'init', 'false') - - - - - - - - + + + deploydb + + + deploydb + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0-alpha-2 + + + initialize + + read-project-properties + + + + ${project.parent.basedir}/utils/conf/db.properties + ${project.parent.basedir}/utils/conf/db.properties.override + + + + + + + maven-antrun-plugin + 1.7 + + + generate-resources + + run + + + + + + + + + + + + + + + + + + + + org.codehaus.mojo + sql-maven-plugin + 1.5 + + + + mysql + mysql-connector-java + ${cs.mysql.version} + + + + org.gjt.mm.mysql.Driver + jdbc:mysql://${db.cloud.host}:${db.cloud.port}/cloud + ${db.cloud.username} + ${db.cloud.password} + + ${maven.test.skip} + true + + + + drop-database + process-test-resources + + execute + + + root + ${db.root.password} + jdbc:mysql://${db.cloud.host}:${db.cloud.port} + drop database if exists `cloud` + + + + create-database + process-test-resources + + execute + + + root + ${db.root.password} + jdbc:mysql://${db.cloud.host}:${db.cloud.port} + create database `cloud` + + + + grant-user-cloud + process-test-resources + + execute + + + root + ${db.root.password} + jdbc:mysql://${db.cloud.host}:${db.cloud.port} + GRANT ALL ON cloud.* to + ${db.cloud.username}@`localhost` identified by + '${db.cloud.password}'; + + + + grant-user-cloud-all + process-test-resources + + execute + + + root + ${db.root.password} + jdbc:mysql://${db.cloud.host}:${db.cloud.port} + GRANT ALL ON cloud.* to + ${db.cloud.username}@`%` identified by + '${db.cloud.password}'; + + + + drop-database-usage + process-test-resources + + execute + + + root + ${db.root.password} + jdbc:mysql://${db.cloud.host}:${db.cloud.port} + drop database if exists `cloud_usage` + + + + create-database-usage + process-test-resources + + execute + + + root + ${db.root.password} + jdbc:mysql://${db.cloud.host}:${db.cloud.port} + create database `cloud_usage` + + + + grant-user-cloud-usage + process-test-resources + + execute + + + root + ${db.root.password} + jdbc:mysql://${db.cloud.host}:${db.cloud.port} + GRANT ALL ON cloud_usage.* to + ${db.cloud.username}@`localhost` identified by + '${db.cloud.password}'; + + + + grant-user-cloud-usage-all + process-test-resources + + execute + + + root + ${db.root.password} + jdbc:mysql://${db.cloud.host}:${db.cloud.port} + GRANT ALL ON cloud_usage.* to + ${db.cloud.username}@`%` identified by + '${db.cloud.password}'; + + + + drop-database-cloudbridge + process-test-resources + + execute + + + root + ${db.root.password} + jdbc:mysql://${db.cloud.host}:${db.cloud.port} + drop database if exists `cloudbridge` + + + + create-database-cloudbridge + process-test-resources + + execute + + + root + ${db.root.password} + jdbc:mysql://${db.cloud.host}:${db.cloud.port} + create database `cloudbridge` + + + + grant-user-cloud-bridge + process-test-resources + + execute + + + root + ${db.root.password} + jdbc:mysql://${db.cloud.host}:${db.cloud.port} + GRANT ALL ON cloudbridge.* to + ${db.cloud.username}@`localhost` identified by + '${db.cloud.password}'; + + + + grant-user-cloud-bridge-all + process-test-resources + + execute + + + root + ${db.root.password} + jdbc:mysql://${db.cloud.host}:${db.cloud.port} + GRANT ALL ON cloudbridge.* to + ${db.cloud.username}@`%` identified by + '${db.cloud.password}'; + + + + create-schema + process-test-resources + + execute + + + + ${basedir}/target/db/create-schema.sql + ${basedir}/target/db/create-schema-premium.sql + ${basedir}/target/db/templates.sql + ${basedir}/target/db/create-index-fk.sql + ${basedir}/target/db/cloudbridge_schema.sql + ${basedir}/target/db/cloudbridge_multipart.sql + ${basedir}/target/db/cloudbridge_index.sql + ${basedir}/target/db/cloudbridge_multipart_alter.sql + ${basedir}/target/db/cloudbridge_bucketpolicy.sql + ${basedir}/target/db/cloudbridge_policy_alter.sql + ${basedir}/target/db/cloudbridge_offering.sql + ${basedir}/target/db/cloudbridge_offering_alter.sql + + + + + prefill-schema + process-test-resources + + execute + + + INSERT INTO `cloud`.`domain` (id, name, + parent, path, owner) VALUES (1, 'ROOT', NULL, '/', + 2) + + + + prefill-configuration + process-test-resources + + execute + + + INSERT INTO `cloud`.`configuration` + (category, instance, component, name, value) VALUES + ('Hidden', 'DEFAULT', 'management-server', 'init', + 'false') + + + + + + + + diff --git a/pom.xml b/pom.xml index 98961bd0df8..5c421a990f9 100644 --- a/pom.xml +++ b/pom.xml @@ -158,6 +158,7 @@ patches client test + tools/devcloud diff --git a/tools/devcloud/pom.xml b/tools/devcloud/pom.xml new file mode 100644 index 00000000000..5f37d65389b --- /dev/null +++ b/tools/devcloud/pom.xml @@ -0,0 +1,73 @@ + + + 4.0.0 + cloud-devcloud + Apache CloudStack Developer Tools + pom + + org.apache.cloudstack + cloudstack + 4.1.0-SNAPSHOT + ../../pom.xml + + + install + + + + clean + + + clean + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + integration-test + + run + + + + + + + + + + + ant + ant-jsch + 1.6.5 + + + jsch + jsch + 0.1.29 + + + + + + + +