incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: maven: Fix deploydb in developer/pom.xml
Date Thu, 17 Jan 2013 01:55:54 GMT
Updated Branches:
  refs/heads/javelin 2be270de8 -> 1db3a84a0


maven: Fix deploydb in developer/pom.xml

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1db3a84a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1db3a84a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1db3a84a

Branch: refs/heads/javelin
Commit: 1db3a84a038fd435eb68c7f59ec38bc5df4ded6c
Parents: 2be270d
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Wed Jan 16 17:25:55 2013 -0800
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Wed Jan 16 17:25:55 2013 -0800

----------------------------------------------------------------------
 developer/pom.xml |  132 +----------------------------------------------
 1 files changed, 3 insertions(+), 129 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1db3a84a/developer/pom.xml
----------------------------------------------------------------------
diff --git a/developer/pom.xml b/developer/pom.xml
index 2cab6a1..e0258cb 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -90,6 +90,8 @@
               </execution>
             </executions>
           </plugin>
+
+          <!-- DatabaseCreator driver here -->
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
@@ -152,135 +154,8 @@
               </arguments>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>sql-maven-plugin</artifactId>
-            <version>1.5</version>
-            <dependencies>
-              <!-- specify the dependent jdbc driver here -->
-              <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>${cs.mysql.version}</version>
-              </dependency>
-            </dependencies>
-            <configuration>
-              <driver>org.gjt.mm.mysql.Driver</driver>
-              <url>jdbc:mysql://${db.cloud.host}:${db.cloud.port}/cloud</url>
-              <username>${db.cloud.username}</username>
-              <password>${db.cloud.password}</password>
-              <!--all executions are ignored if -Dmaven.test.skip=true -->
-              <skip>${maven.test.skip}</skip>
-              <forceMojoExecution>true</forceMojoExecution>
-            </configuration>
-            <executions>
-              <execution>
-                <id>create-other-schema</id>
-                <phase>process-test-resources</phase>
-                <goals>
-                  <goal>execute</goal>
-                </goals>
-                <configuration>
-                  <srcFiles>
-                    <srcFile>${basedir}/target/db/create-schema-view.sql</srcFile>
-                    <srcFile>${basedir}/target/db/templates.sql</srcFile>
-                    <srcFile>${basedir}/target/db/cloudbridge_schema.sql</srcFile>
-                    <srcFile>${basedir}/target/db/cloudbridge_multipart.sql</srcFile>
-                    <srcFile>${basedir}/target/db/cloudbridge_index.sql</srcFile>
-                    <srcFile>${basedir}/target/db/cloudbridge_multipart_alter.sql</srcFile>
-                    <srcFile>${basedir}/target/db/cloudbridge_bucketpolicy.sql</srcFile>
-                    <srcFile>${basedir}/target/db/cloudbridge_policy_alter.sql</srcFile>
-                    <srcFile>${basedir}/target/db/cloudbridge_offering.sql</srcFile>
-                    <srcFile>${basedir}/target/db/cloudbridge_offering_alter.sql</srcFile>
-                  </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>
-              <execution>
-                <id>prefill-configuration</id>
-                <phase>process-test-resources</phase>
-                <goals>
-                  <goal>execute</goal>
-                </goals>
-                <configuration>
-                  <sqlCommand>INSERT INTO `cloud`.`configuration`
-                    (category, instance, component, name, value) VALUES
-                    ('Hidden', 'DEFAULT', 'management-server', 'init',
-                    'false')</sqlCommand>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>cleandb</id>
-      <activation>
-        <property>
-          <name>cleandb</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>properties-maven-plugin</artifactId>
-            <version>1.0-alpha-2</version>
-            <executions>
-              <execution>
-                <phase>initialize</phase>
-                <goals>
-                  <goal>read-project-properties</goal>
-                </goals>
-                <configuration>
-                  <files>
-                    <file>${project.parent.basedir}/utils/conf/db.properties</file>
-                    <file>${project.parent.basedir}/utils/conf/db.properties.override</file>
-                  </files>
-                  <quiet>true</quiet>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.7</version>
-            <executions>
-              <execution>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <target>
-                    <filter token="VERSION" value="${project.version}" />
-                    <copy todir="${basedir}/target/db" filtering="true">
-                      <fileset dir="${project.basedir}/../setup/db/" />
 
-                    </copy>
-                    <copy todir="${basedir}/target/db" filtering="true">
-                      <fileset
-                        dir="${project.basedir}/../awsapi-setup/db/mysql/">
-                        <include name="**/*.sql" />
-                      </fileset>
-                    </copy>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
+          <!-- Database schema deployer and db prefill seeder -->
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>sql-maven-plugin</artifactId>
@@ -294,7 +169,6 @@
               </dependency>
             </dependencies>
             <configuration>
-
               <driver>org.gjt.mm.mysql.Driver</driver>
               <url>jdbc:mysql://${db.cloud.host}:${db.cloud.port}/cloud</url>
               <username>${db.cloud.username}</username>


Mime
View raw message