Commit 5381085f authored by bseeger's avatar bseeger
Browse files

Merge branch 'mysql' into 'master'

Replace mysql-based service with MariaDB

Closes #32

See merge request !107
parents 7a4e8a61 f04fd7aa
......@@ -39,7 +39,7 @@ These modules listen to repository events and react accordingly.
* [`acrepo-connector-broadcast`](acrepo-connector-broadcast): Message Broadcast Service: This rebroadcasts messages from one queue/topic to every queue/topic in a specified list
* [`acrepo-connector-idiomatic`](acrepo-connector-idiomatic): Id Mapping Service: This maps a public ID to an internal (and in some cases, much longer) LDP server URI
* [`acrepo-connector-idiomatic-mysql`](acrepo-connector-idiomatic-mysql): Id Mapping Service Database: This exposes a MySQL datastore for use with the Id Mapping service
* [`acrepo-connector-idiomatic-mariadb`](acrepo-connector-idiomatic-mariadb): Id Mapping Service Database: This exposes a MariaDB datastore for use with the Id Mapping service
* [`acrepo-connector-idiomatic-pgsql`](acrepo-connector-idiomatic-pgsql): Id Mapping Service Database: This exposes a Postgres datastore for use with the Id Mapping service
* [`acrepo-connector-triplestore`](acrepo-connector-triplestore): Triplestore Indexing Service: This indexes LDP resources into named graphs in an external triplestore.
......@@ -65,7 +65,7 @@ command from its shell:
feature:install acrepo-connector-broadcast
feature:install acrepo-connector-idiomatic
feature:install acrepo-connector-idiomatic-mysql
feature:install acrepo-connector-idiomatic-mariadb
feature:install acrepo-connector-idiomatic-pgsql
feature:install acrepo-connector-triplestore
......
Amherst College ID Mapping Service (MySQL)
Amherst College ID Mapping Service (MariaDB)
===============================================
This service implements a database backend for the ID Mapping Service
......@@ -18,7 +18,7 @@ This project can be deployed in an OSGi container. For example using
command from its shell:
feature:repo-add mvn:edu.amherst.acdc/acrepo-karaf/LATEST/xml/features
feature:install acrepo-connector-idiomatic-mysql
feature:install acrepo-connector-idiomatic-mariadb
Configuration
-------------
......
group = 'edu.amherst.acdc'
description = 'ID Mapping MySQL Connector'
description = 'ID Mapping MariaDB Connector'
publishing.publications {
maven(MavenPublication) {
artifact ('build/cfg/main/edu.amherst.acdc.connector.idiomatic.mysql.cfg') {
artifact ('build/cfg/main/edu.amherst.acdc.connector.idiomatic.mariadb.cfg') {
classifier 'configuration'
extension 'cfg'
}
......
# These values should not be changed
osgi.jdbc.driver.name=mysql
osgi.jdbc.driver.class=com.mysql.jdbc.Driver
osgi.jdbc.driver.name=mariadb
osgi.jdbc.driver.class=org.mariadb.jdbc.Driver
dataSourceName=jdbc/idiomaticds
# The values below should be configured to match your
......
......@@ -21,17 +21,17 @@
<configfile finalname="/etc/edu.amherst.acdc.connector.idiomatic.cfg">mvn:edu.amherst.acdc/acrepo-connector-idiomatic/${project.version}/cfg/configuration</configfile>
</feature>
<feature name="acrepo-connector-idiomatic-mysql" version="${project.version}">
<details>Installs the id mapping service database (MySQL)</details>
<feature name="acrepo-connector-idiomatic-mariadb" version="${project.version}">
<details>Installs the id mapping service database (MariaDB)</details>
<feature>jdbc</feature>
<feature>jndi</feature>
<feature>transaction</feature>
<feature>pax-jdbc-config</feature>
<feature>pax-jdbc-mysql</feature>
<feature>pax-jdbc-mariadb</feature>
<feature>pax-jdbc-pool-dbcp2</feature>
<configfile finalname="/etc/org.ops4j.datasource-idiomatic.cfg">mvn:edu.amherst.acdc/acrepo-connector-idiomatic-mysql/${project.version}/cfg/configuration</configfile>
<configfile finalname="/etc/org.ops4j.datasource-idiomatic.cfg">mvn:edu.amherst.acdc/acrepo-connector-idiomatic-mariadb/${project.version}/cfg/configuration</configfile>
</feature>
<feature name="acrepo-connector-idiomatic-pgsql" version="${project.version}">
......
......@@ -2,7 +2,7 @@ enableFeaturePreview('STABLE_PUBLISHING')
rootProject.name = 'repository-services'
include ':acrepo-connector-broadcast'
include ':acrepo-connector-idiomatic'
include ':acrepo-connector-idiomatic-mysql'
include ':acrepo-connector-idiomatic-mariadb'
include ':acrepo-connector-idiomatic-pgsql'
include ':acrepo-connector-triplestore'
include ':acrepo-exts-entailment'
......@@ -23,7 +23,7 @@ include ':acrepo-itests'
project(':acrepo-connector-broadcast').projectDir = "$rootDir/acrepo-connector-broadcast" as File
project(':acrepo-connector-idiomatic').projectDir = "$rootDir/acrepo-connector-idiomatic" as File
project(':acrepo-connector-idiomatic-mysql').projectDir = "$rootDir/acrepo-connector-idiomatic-mysql" as File
project(':acrepo-connector-idiomatic-mariadb').projectDir = "$rootDir/acrepo-connector-idiomatic-mariadb" as File
project(':acrepo-connector-idiomatic-pgsql').projectDir = "$rootDir/acrepo-connector-idiomatic-pgsql" as File
project(':acrepo-connector-triplestore').projectDir = "$rootDir/acrepo-connector-triplestore" as File
project(':acrepo-exts-entailment').projectDir = "$rootDir/acrepo-exts-entailment" as File
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment