Skip to content

Commit a0f9324

Browse files
spark404spark404
committed
Move mysql ha strategy to a plugin. Activate this plugin using the mysqlha profile or the noredist flag
1 parent bb6fddf commit a0f9324

5 files changed

Lines changed: 54 additions & 5 deletions

File tree

‎client/pom.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,21 @@
718718
</dependency>
719719
</dependencies>
720720
</profile>
721+
<profile>
722+
<id>mysqlha</id>
723+
<activation>
724+
<property>
725+
<name>noredist</name>
726+
</property>
727+
</activation>
728+
<dependencies>
729+
<dependency>
730+
<groupId>org.apache.cloudstack</groupId>
731+
<artifactId>cloud-plugin-database-myqslha</artifactId>
732+
<version>${project.version}</version>
733+
</dependency>
734+
</dependencies>
735+
</profile>
721736
<profile>
722737
<id>quickcloud</id>
723738
<activation>

‎framework/db/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@
4848
<artifactId>cloud-utils</artifactId>
4949
<version>${project.version}</version>
5050
</dependency>
51-
<dependency>
52-
<groupId>mysql</groupId>
53-
<artifactId>mysql-connector-java</artifactId>
54-
<scope>provided</scope>
55-
</dependency>
5651
</dependencies>
5752
<build>
5853
<plugins>

‎plugins/database/mysql-ha/pom.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
license agreements. See the NOTICE file distributed with this work for additional
3+
information regarding copyright ownership. The ASF licenses this file to you under
4+
the Apache License, Version 2.0 (the "License"); you may not use this file except
5+
in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6+
Unless required by applicable law or agreed to in writing, software distributed under
7+
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
8+
OF ANY KIND, either express or implied. See the License for the specific language
9+
governing permissions and limitations under the License. -->
10+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
12+
<modelVersion>4.0.0</modelVersion>
13+
<artifactId>cloud-plugin-database-mysqlha</artifactId>
14+
<name>Apache CloudStack Plugin - MySQL HA Strategy</name>
15+
<parent>
16+
<groupId>org.apache.cloudstack</groupId>
17+
<artifactId>cloudstack-plugins</artifactId>
18+
<version>4.4.0-SNAPSHOT</version>
19+
<relativePath>../pom.xml</relativePath>
20+
</parent>
21+
<dependencies>
22+
<dependency>
23+
<groupId>mysql</groupId>
24+
<artifactId>mysql-connector-java</artifactId>
25+
<scope>provided</scope>
26+
</dependency>
27+
</dependencies>
28+
</project>

framework/db/src/com/cloud/utils/db/StaticStrategy.java renamed to plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java

File renamed without changes.

‎plugins/pom.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,17 @@
173173
<module>network-elements/cisco-vnmc</module>
174174
</modules>
175175
</profile>
176+
<profile>
177+
<id>mysqlha</id>
178+
<activation>
179+
<property>
180+
<name>noredist</name>
181+
</property>
182+
</activation>
183+
<modules>
184+
<module>database/mysql-ha</module>
185+
</modules>
186+
</profile>
176187
<profile>
177188
<id>simulator</id>
178189
<activation>

0 commit comments

Comments
 (0)