Skip to content

Commit

Permalink
Add HA/Failover (CONJ-154)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rusher
rusher committed Jul 16, 2015
1 parent 4ec0994 commit 76372ae
Show file tree
Hide file tree
Showing 74 changed files with 8,247 additions and 1,680 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
MariaDB Connector/J is used to connect applications developed in Java to MariaDB and MySQL databases. MariaDB Connector/J is LGPL licensed.

Tracker link <a href="https://mariadb.atlassian.net/projects/CONJ/issues/">https://mariadb.atlassian.net/projects/CONJ/issues/</a>

<!--
## Status
[![Build Status](https://travis-ci.org/MariaDB/mariadb-connector-j.svg?branch=master)](https://travis-ci.org/MariaDB/mariadb-connector-j)

[![Build Status](https://travis-ci.org/MariaDB/mariadb-connector-j.svg)](https://travis-ci.org/MariaDB/mariadb-connector-j)
-->
## Obtaining the driver
The driver (jar) can be downloaded from [mariadb connector download](https://mariadb.com/products/connectors-plugins)

Expand Down
25 changes: 25 additions & 0 deletions build.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- ====================================================================== -->
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
<!-- ====================================================================== -->

<project name="mariadb-java-client" default="package" basedir=".">

<!-- ====================================================================== -->
<!-- Import maven-build.xml into the current project -->
<!-- ====================================================================== -->

<import file="maven-build.xml"/>
<presetdef name="javac">
<javac includeantruntime="false"/>
</presetdef>
<!-- ====================================================================== -->
<!-- Help target -->
<!-- ====================================================================== -->

<target name="help">
<echo message="Please run: $ant -projecthelp"/>
</target>

</project>
22 changes: 22 additions & 0 deletions maven-build.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
#Mon Jul 13 22:05:03 CEST 2015
maven.settings.offline=false
maven.build.finalName=mariadb-java-client-1.2.0-SNAPSHOT
maven.build.resourceDir.0=src/main/resources
maven.build.testOutputDir=${maven.build.dir}/test-classes
maven.build.testResourceDir.0=src/test/resources
jna.version=3.3.0
maven.reporting.outputDirectory=${maven.build.dir}/site
project.build.sourceEncoding=UTF-8
maven.build.srcDir.0=src/main/java
sonatypeOssDistMgmtSnapshotsUrl=https\://oss.sonatype.org/content/repositories/snapshots/
project.build.directory=${maven.build.dir}
maven.test.reports=${maven.build.dir}/test-reports
maven.build.dir=target
project.build.outputDirectory=${maven.build.outputDir}
version.file=src/main/java/org/mariadb/jdbc/Version.java
version.template.file=src/main/resources/Version.java.template
maven.build.testDir.0=src/test/java
maven.settings.interactiveMode=true
maven.repo.local=${user.home}/.m2/repository
maven.build.outputDir=${maven.build.dir}/classes
305 changes: 305 additions & 0 deletions maven-build.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,305 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- ====================================================================== -->
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
<!-- ====================================================================== -->

<!-- ====================================================================== -->
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
<!-- ====================================================================== -->
<!-- -->
<!-- Any modifications will be overwritten. -->
<!-- -->
<!-- Generated by Maven Ant Plugin on 7/13/15 10:05 PM -->
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
<!-- -->
<!-- ====================================================================== -->

<project name="mariadb-java-client-from-maven" default="package" basedir=".">

<!-- ====================================================================== -->
<!-- Build environment properties -->
<!-- ====================================================================== -->

<property file="${user.home}/.m2/maven.properties"/>
<property file="maven-build.properties"/>

<property name="maven.build.finalName" value="mariadb-java-client-1.2.0-SNAPSHOT"/>
<property name="maven.build.dir" value="target"/>
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
<property name="maven.build.srcDir.0" value="src/main/java"/>
<property name="maven.build.resourceDir.0" value="src/main/resources"/>
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
<property name="maven.build.testDir.0" value="src/test/java"/>
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>

<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
<property name="maven.settings.offline" value="false"/>
<property name="maven.settings.interactiveMode" value="true"/>

<!-- ====================================================================== -->
<!-- Defining classpaths -->
<!-- ====================================================================== -->

<path id="build.classpath">
<pathelement location="${maven.repo.local}/net/java/dev/jna/jna/3.3.0/jna-3.3.0.jar"/>
<pathelement location="${maven.repo.local}/net/java/dev/jna/jna/3.3.0/jna-3.3.0-platform.jar"/>
<pathelement location="${maven.repo.local}/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"/>
<pathelement location="${maven.repo.local}/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar"/>
</path>
<path id="build.test.classpath">
<pathelement location="${maven.repo.local}/junit/junit/4.12/junit-4.12.jar"/>
<pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
<pathelement location="${maven.repo.local}/net/java/dev/jna/jna/3.3.0/jna-3.3.0.jar"/>
<pathelement location="${maven.repo.local}/net/java/dev/jna/jna/3.3.0/jna-3.3.0-platform.jar"/>
<pathelement location="${maven.repo.local}/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"/>
<pathelement location="${maven.repo.local}/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar"/>
</path>

<!-- ====================================================================== -->
<!-- Cleaning up target -->
<!-- ====================================================================== -->

<target name="clean" description="Clean the output directory">
<delete dir="${maven.build.dir}"/>
</target>

<!-- ====================================================================== -->
<!-- Compilation target -->
<!-- ====================================================================== -->

<target name="compile" depends="get-deps" description="Compile the code">
<mkdir dir="${maven.build.outputDir}"/>
<javac destdir="${maven.build.outputDir}"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="1.7"
verbose="false"
fork="false"
source="1.7">
<src>
<pathelement location="${maven.build.srcDir.0}"/>
</src>
<classpath refid="build.classpath"/>
</javac>
<copy todir="${maven.build.outputDir}">
<fileset dir="${maven.build.resourceDir.0}"/>
</copy>
</target>

<!-- ====================================================================== -->
<!-- Test-compilation target -->
<!-- ====================================================================== -->

<target name="compile-tests"
depends="compile"
description="Compile the test code"
unless="maven.test.skip">
<mkdir dir="${maven.build.testOutputDir}"/>
<javac destdir="${maven.build.testOutputDir}"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="1.7"
verbose="false"
fork="false"
source="1.7">
<src>
<pathelement location="${maven.build.testDir.0}"/>
</src>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${maven.build.outputDir}"/>
</classpath>
</javac>
<copy todir="${maven.build.testOutputDir}">
<fileset dir="${maven.build.testResourceDir.0}"/>
</copy>
</target>

<!-- ====================================================================== -->
<!-- Run all tests -->
<!-- ====================================================================== -->

<target name="test"
depends="compile-tests, junit-missing"
unless="junit.skipped"
description="Run the test cases">
<mkdir dir="${maven.test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${maven.build.outputDir}"/>
<pathelement location="${maven.build.testOutputDir}"/>
</classpath>
<batchtest todir="${maven.test.reports}" unless="test">
<fileset dir="${maven.build.testDir.0}">
<include name="**/Test*.java"/>
<include name="**/*Test.java"/>
<include name="**/*TestCase.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
<batchtest todir="${maven.test.reports}" if="test">
<fileset dir="${maven.build.testDir.0}">
<include name="**/${test}.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
</junit>
</target>

<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
</target>

<target name="test-junit-status"
depends="test-junit-present">
<condition property="junit.missing">
<and>
<isfalse value="${junit.present}"/>
<isfalse value="${maven.test.skip}"/>
</and>
</condition>
<condition property="junit.skipped">
<or>
<isfalse value="${junit.present}"/>
<istrue value="${maven.test.skip}"/>
</or>
</condition>
</target>

<target name="junit-missing"
depends="test-junit-status"
if="junit.missing">
<echo>=================================== WARNING ===================================</echo>
<echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
<echo>===============================================================================</echo>
</target>

<!-- ====================================================================== -->
<!-- Javadoc target -->
<!-- ====================================================================== -->

<target name="javadoc" description="Generates the Javadoc of the application">
<javadoc sourcepath="${maven.build.srcDir.0}"
packagenames="*"
destdir="${maven.reporting.outputDirectory}/apidocs"
access="protected"
old="false"
verbose="false"
version="true"
use="true"
author="true"
splitindex="false"
nodeprecated="false"
nodeprecatedlist="false"
notree="false"
noindex="false"
nohelp="false"
nonavbar="false"
serialwarn="false"
charset="ISO-8859-1"
linksource="false"
breakiterator="false"/>
</target>

<!-- ====================================================================== -->
<!-- Package target -->
<!-- ====================================================================== -->

<target name="package" depends="compile,test" description="Package the application">
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
manifest="src/main/resources/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html"/>
</target>

<!-- ====================================================================== -->
<!-- A dummy target for the package named after the type it creates -->
<!-- ====================================================================== -->

<target name="jar" depends="package" description="Builds the jar for the application"/>

<!-- ====================================================================== -->
<!-- Download dependencies target -->
<!-- ====================================================================== -->

<target name="test-offline">
<condition property="maven.mode.offline">
<equals arg1="${maven.settings.offline}" arg2="true"/>
</condition>
</target>

<target name="get-deps"
depends="test-offline"
description="Download all dependencies"
unless="maven.mode.offline">
<mkdir dir="${maven.repo.local}"/>
<mkdir dir="${maven.repo.local}/junit/junit/4.12"/>
<get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.12/junit-4.12.jar"
dest="${maven.repo.local}/junit/junit/4.12/junit-4.12.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="https://repo.maven.apache.org/maven2/junit/junit/4.12/junit-4.12.jar"
dest="${maven.repo.local}/junit/junit/4.12/junit-4.12.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3"/>
<get src="https://oss.sonatype.org/content/repositories/snapshots/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/net/java/dev/jna/jna/3.3.0"/>
<get src="https://oss.sonatype.org/content/repositories/snapshots/net/java/dev/jna/jna/3.3.0/jna-3.3.0.jar"
dest="${maven.repo.local}/net/java/dev/jna/jna/3.3.0/jna-3.3.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/3.3.0/jna-3.3.0.jar"
dest="${maven.repo.local}/net/java/dev/jna/jna/3.3.0/jna-3.3.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/net/java/dev/jna/jna/3.3.0"/>
<get src="https://oss.sonatype.org/content/repositories/snapshots/net/java/dev/jna/jna/3.3.0/jna-3.3.0-platform.jar"
dest="${maven.repo.local}/net/java/dev/jna/jna/3.3.0/jna-3.3.0-platform.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/3.3.0/jna-3.3.0-platform.jar"
dest="${maven.repo.local}/net/java/dev/jna/jna/3.3.0/jna-3.3.0-platform.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/commons-dbcp/commons-dbcp/1.4"/>
<get src="https://oss.sonatype.org/content/repositories/snapshots/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"
dest="${maven.repo.local}/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="https://repo.maven.apache.org/maven2/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"
dest="${maven.repo.local}/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/commons-pool/commons-pool/1.5.4"/>
<get src="https://oss.sonatype.org/content/repositories/snapshots/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar"
dest="${maven.repo.local}/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="https://repo.maven.apache.org/maven2/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar"
dest="${maven.repo.local}/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar"
usetimestamp="false"
ignoreerrors="true"/>
</target>

</project>
Loading

0 comments on commit 76372ae

Please sign in to comment.