From a0f932437c9ac9a0a82cc9b45b1aa6f17e8a478a Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Thu, 27 Feb 2014 09:48:55 +0100
Subject: [PATCH] Move mysql ha strategy to a plugin. Activate this plugin
 using the mysqlha profile or the noredist flag

---
 client/pom.xml                                | 15 ++++++++++
 framework/db/pom.xml                          |  5 ----
 plugins/database/mysql-ha/pom.xml             | 28 +++++++++++++++++++
 .../com/cloud/utils/db/StaticStrategy.java    |  0
 plugins/pom.xml                               | 11 ++++++++
 5 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 plugins/database/mysql-ha/pom.xml
 rename {framework/db => plugins/database/mysql-ha}/src/com/cloud/utils/db/StaticStrategy.java (100%)

diff --git a/client/pom.xml b/client/pom.xml
index 0980b641fb0..78fab6fd5ab 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -718,6 +718,21 @@
         </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <id>mysqlha</id>
+      <activation>
+        <property>
+          <name>noredist</name>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.cloudstack</groupId>
+          <artifactId>cloud-plugin-database-myqslha</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
     <profile>
       <id>quickcloud</id>
       <activation>
diff --git a/framework/db/pom.xml b/framework/db/pom.xml
index e9fefd2f407..8b41703f230 100644
--- a/framework/db/pom.xml
+++ b/framework/db/pom.xml
@@ -48,11 +48,6 @@
       <artifactId>cloud-utils</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/plugins/database/mysql-ha/pom.xml b/plugins/database/mysql-ha/pom.xml
new file mode 100644
index 00000000000..5ce6d6f52b1
--- /dev/null
+++ b/plugins/database/mysql-ha/pom.xml
@@ -0,0 +1,28 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+  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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-database-mysqlha</artifactId>
+  <name>Apache CloudStack Plugin - MySQL HA Strategy</name>
+  <parent>
+    <groupId>org.apache.cloudstack</groupId>
+    <artifactId>cloudstack-plugins</artifactId>
+    <version>4.4.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/framework/db/src/com/cloud/utils/db/StaticStrategy.java b/plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java
similarity index 100%
rename from framework/db/src/com/cloud/utils/db/StaticStrategy.java
rename to plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java
diff --git a/plugins/pom.xml b/plugins/pom.xml
index a9cf6179634..097f2246013 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -173,6 +173,17 @@
         <module>network-elements/cisco-vnmc</module>
       </modules>
     </profile>
+    <profile>
+      <id>mysqlha</id>
+      <activation>
+        <property>
+          <name>noredist</name>
+        </property>
+      </activation>
+      <modules>
+        <module>database/mysql-ha</module>
+      </modules>
+    </profile>
     <profile>
       <id>simulator</id>
       <activation>