Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Activity Manager H2 JDBC Driver Fragment
Bundle-SymbolicName: org.activitymgr.core.dao.h2fragment
Bundle-Version: 1.4.1.qualifier
Bundle-Version: 1.4.4.qualifier
Fragment-Host: org.apache.commons.dbcp
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ClassPath: h2-1.3.172.jar
2 changes: 1 addition & 1 deletion core/plugins/org.activitymgr.core.dao.h2fragment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<parent>
<groupId>org.activitymgr</groupId>
<artifactId>parent</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.4-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Activity Manager Hsqldb JDBC Driver Fragment
Bundle-SymbolicName: org.activitymgr.core.dao.hsqldbfragment
Bundle-Version: 1.4.1.qualifier
Bundle-Version: 1.4.4.qualifier
Fragment-Host: org.apache.commons.dbcp
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ClassPath: hsqldb-2.3.4.jar
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<parent>
<groupId>org.activitymgr</groupId>
<artifactId>parent</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.4-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Activity Manager Mysql Driver Fragment
Bundle-SymbolicName: org.activitymgr.core.dao.mysqlfragment
Bundle-Version: 1.4.1.qualifier
Bundle-Version: 1.4.4.qualifier
Fragment-Host: org.apache.commons.dbcp
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ClassPath: mysql-connector-java-5.1.26-bin.jar
Bundle-ClassPath: mariadb-java-client-3.4.1.jar
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
bin.includes = META-INF/,\
mysql-connector-java-5.1.26-bin.jar
mariadb-java-client-3.4.1.jar
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<parent>
<groupId>org.activitymgr</groupId>
<artifactId>parent</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.4-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/plugins/org.activitymgr.core.dao/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Activity Manager DAO Layer
Bundle-SymbolicName: org.activitymgr.core.dao
Automatic-Module-Name: org.activitymgr.core.dao
Bundle-Version: 1.4.1.qualifier
Bundle-Version: 1.4.4.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.activitymgr.core.dto;bundle-version="1.0.0",
org.activitymgr.core.util;bundle-version="1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion core/plugins/org.activitymgr.core.dao/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<parent>
<groupId>org.activitymgr</groupId>
<artifactId>parent</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.4-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/plugins/org.activitymgr.core.dto/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Activity Manager Data Transfer Objects
Bundle-SymbolicName: org.activitymgr.core.dto
Bundle-Version: 1.4.1.qualifier
Bundle-Version: 1.4.4.qualifier
Bundle-Vendor: Jean-Francois Brazeau
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.activitymgr.core.dto,
Expand Down
2 changes: 1 addition & 1 deletion core/plugins/org.activitymgr.core.dto/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<parent>
<groupId>org.activitymgr</groupId>
<artifactId>parent</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.4-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Activity Manager Core
Bundle-SymbolicName: org.activitymgr.core.model;singleton:=true
Bundle-Version: 1.4.1.qualifier
Bundle-Version: 1.4.4.qualifier
Bundle-Vendor: Jean-Francois Brazeau
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.activitymgr.core.util,
Expand Down
2 changes: 1 addition & 1 deletion core/plugins/org.activitymgr.core.model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<parent>
<groupId>org.activitymgr</groupId>
<artifactId>parent</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.4-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/plugins/org.activitymgr.core.orm/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Lightweight ORM
Bundle-SymbolicName: org.activitymgr.core.orm
Bundle-Version: 1.4.1.qualifier
Bundle-Version: 1.4.4.qualifier
Bundle-Vendor: Jean-Francois Brazeau
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.apache.log4j
Expand Down
2 changes: 1 addition & 1 deletion core/plugins/org.activitymgr.core.orm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<parent>
<groupId>org.activitymgr</groupId>
<artifactId>parent</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.4-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Activity Manager Utility Class
Bundle-SymbolicName: org.activitymgr.core.util
Bundle-Version: 1.4.1.qualifier
Bundle-Version: 1.4.4.qualifier
Bundle-Vendor: Jean-Francois Brazeau
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.activitymgr.core.util
Expand Down
2 changes: 1 addition & 1 deletion core/plugins/org.activitymgr.core.util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<parent>
<groupId>org.activitymgr</groupId>
<artifactId>parent</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.4-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ DatabaseUI.buttons.EXPORT_DATABASE=Export database
DatabaseUI.buttons.IMPORT_DATABASE=Import from XML
DatabaseUI.buttons.OPEN_DATABASE=Open database
DatabaseUI.buttons.RESET_DATABASE=Reset database data
DatabaseUI.databasetypes.MYSQL_SERVER=MySQL Server database
DatabaseUI.databasetypes.MARIA_DB=MariaDB database
DatabaseUI.databasetypes.STANDALONE_MODE=Standalone mode (embedded HSQL database)
DatabaseUI.databasetypes.USER_DEFINED=User defined database
DatabaseUI.errors.DATABASE_NOT_INSTALLED=Database not installed.\nConnection failed.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ DatabaseUI.buttons.EXPORT_DATABASE=Exporter la base
DatabaseUI.buttons.IMPORT_DATABASE=Importer depuis XML
DatabaseUI.buttons.OPEN_DATABASE=Ouvrir la base
DatabaseUI.buttons.RESET_DATABASE=R�initialiser les donn�es
DatabaseUI.databasetypes.MYSQL_SERVER=Base de donn�es MySQL Server
DatabaseUI.databasetypes.MARIA_DB=Base de donn�es MariaDB
DatabaseUI.databasetypes.STANDALONE_MODE=Mode standalone (base HSQL embarqu�e)
DatabaseUI.databasetypes.USER_DEFINED=Autre base de donn�e
DatabaseUI.databasetypes.USER_DEFINED=Autre base de donn�es
DatabaseUI.errors.DATABASE_NOT_INSTALLED=La base de donn�es n''est pas install�e.\nLa connexion a �chou�.
DatabaseUI.errors.DURATIONS_CREATION_ERROR=Erreur inattendue lors de la cr�ation des dur�es par d�faut
DatabaseUI.errors.FILE_DOES_NOT_EXIST=Le fichier sp�cifi� n'existe pas. Veuillez sp�cifier un nom valide.
Expand Down
2 changes: 1 addition & 1 deletion core/releng/org.activitymgr.core.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.activitymgr.core.feature"
label="Activity Manager Core Feature"
version="1.4.1.qualifier">
version="1.4.4.qualifier">

<description url="https://github.com/jfbrazeau/Activity-Manager">
Activity Manager Core Feature.
Expand Down
2 changes: 1 addition & 1 deletion core/releng/org.activitymgr.core.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<parent>
<groupId>org.activitymgr</groupId>
<artifactId>parent</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.4-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/tests/org.activitymgr.core.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Activity Manager Core Tests
Bundle-SymbolicName: org.activitymgr.core.tests
Bundle-Version: 1.4.1.qualifier
Bundle-Version: 1.4.4.qualifier
Bundle-Vendor: Jean-Francois Brazeau
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.activitymgr.core.model;visibility:=reexport,
Expand Down
2 changes: 1 addition & 1 deletion core/tests/org.activitymgr.core.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<parent>
<groupId>org.activitymgr</groupId>
<artifactId>parent</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.4-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ hsqlmem.url=jdbc:hsqldb:mem:activitymgrdb
hsqlmem.user=sa
hsqlmem.password=

mysql.url=jdbc:mysql://localhost/taskmgr_db
mysql.driver=com.mysql.jdbc.Driver
mysql.url=jdbc:mariadb://localhost/taskmgr_db
mysql.driver=org.mariadb.jdbc.Driver
mysql.user=taskmgr_user
mysql.password=secret

Expand Down
22 changes: 22 additions & 0 deletions misc/docker/mariadb12/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM debian:12

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
bash \
ca-certificates \
mariadb-client \
mariadb-server \
procps \
psmisc \
&& rm -rf /var/lib/apt/lists/*

COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh

RUN sed -i 's/\r$//' /usr/local/bin/docker-entrypoint.sh \
&& chmod +x /usr/local/bin/docker-entrypoint.sh

EXPOSE 3306

ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
75 changes: 75 additions & 0 deletions misc/docker/mariadb12/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
#!/usr/bin/env bash
set -euo pipefail

DB_BASE="${DB_BASE:-/usr}"
DB_DATADIR="${DB_DATADIR:-/var/lib/mysql}"
DB_RUNDIR="${DB_RUNDIR:-/run/mysqld}"
DB_SOCKET="${DB_SOCKET:-${DB_RUNDIR}/mysqld.sock}"
DB_PORT="${DB_PORT:-3306}"
DB_NAME="${DB_NAME:-taskmgr_db}"
DB_USER="${DB_USER:-taskmgr_user}"
DB_PASSWORD="${DB_PASSWORD:-secret}"
DB_INIT_MARKER="${DB_INIT_MARKER:-${DB_DATADIR}/.activitymgr_initialized}"

mkdir -p "${DB_DATADIR}" "${DB_RUNDIR}"
chown -R mysql:mysql "${DB_DATADIR}" "${DB_RUNDIR}"

MARIADB_INSTALL_DB="/usr/bin/mariadb-install-db"
MYSQLD_SAFE="/usr/bin/mysqld_safe"
MARIADB_ADMIN="/usr/bin/mariadb-admin"
MARIADB="/usr/bin/mariadb"

if [[ ! -d "${DB_DATADIR}/mysql" ]]; then
echo "[mariadb12] Initializing MariaDB data directory"
"${MARIADB_INSTALL_DB}" \
--basedir="${DB_BASE}" \
--datadir="${DB_DATADIR}" \
--user=mysql
fi

if [[ ! -f "${DB_INIT_MARKER}" ]]; then
echo "[mariadb12] Starting temporary MariaDB instance"
"${MYSQLD_SAFE}" \
--basedir="${DB_BASE}" \
--datadir="${DB_DATADIR}" \
--socket="${DB_SOCKET}" \
--port="${DB_PORT}" \
--user=mysql \
--skip-networking=0 \
--bind-address=127.0.0.1 \
>/tmp/mariadb-init.log 2>&1 &

for i in $(seq 1 120); do
if "${MARIADB_ADMIN}" --socket="${DB_SOCKET}" --user=root ping --silent >/dev/null 2>&1; then
break
fi
sleep 1
done

if ! "${MARIADB_ADMIN}" --socket="${DB_SOCKET}" --user=root ping --silent >/dev/null 2>&1; then
cat /tmp/mariadb-init.log >&2 || true
echo "[mariadb12] Temporary MariaDB instance did not become ready" >&2
exit 1
fi

"${MARIADB}" --socket="${DB_SOCKET}" --user=root <<SQL
CREATE DATABASE IF NOT EXISTS \`${DB_NAME}\`;
CREATE USER IF NOT EXISTS '${DB_USER}'@'%' IDENTIFIED BY '${DB_PASSWORD}';
GRANT ALL PRIVILEGES ON \`${DB_NAME}\`.* TO '${DB_USER}'@'%';
FLUSH PRIVILEGES;
SQL

"${MARIADB_ADMIN}" --socket="${DB_SOCKET}" --user=root shutdown
touch "${DB_INIT_MARKER}"
chown mysql:mysql "${DB_INIT_MARKER}"
fi

echo "[mariadb12] Starting Debian 12 MariaDB on port ${DB_PORT}"
exec "${MYSQLD_SAFE}" \
--basedir="${DB_BASE}" \
--datadir="${DB_DATADIR}" \
--socket="${DB_SOCKET}" \
--port="${DB_PORT}" \
--user=mysql \
--skip-networking=0 \
--bind-address=0.0.0.0
25 changes: 4 additions & 21 deletions misc/docker/mysql55/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,40 +1,23 @@
FROM debian/eol:jessie

ARG MYSQL_VERSION=5.5.47
ARG MYSQL_DOWNLOAD_URL=https://downloads.mysql.com/archives/get/p/23/file/mysql-5.5.47-linux2.6-x86_64.tar.gz

RUN printf '%s\n' \
'deb http://archive.debian.org/debian jessie main' \
'deb http://archive.debian.org/debian-security jessie/updates main' \
> /etc/apt/sources.list \
&& printf 'Acquire::Check-Valid-Until "false";\n' > /etc/apt/apt.conf.d/99no-check-valid-until

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
bash \
ca-certificates \
curl \
libaio1 \
libncurses5 \
perl \
procps \
psmisc \
tar \
mysql-client \
mysql-server \
&& rm -rf /var/lib/apt/lists/*

RUN groupadd -r mysql \
&& useradd -r -g mysql -s /bin/false mysql \
&& mkdir -p /opt /var/lib/mysql /var/run/mysqld \
&& curl -fsSL "${MYSQL_DOWNLOAD_URL}" -o /tmp/mysql.tar.gz \
&& tar -xzf /tmp/mysql.tar.gz -C /opt \
&& mv "/opt/mysql-${MYSQL_VERSION}-linux2.6-x86_64" /opt/mysql \
&& test -x /opt/mysql/bin/my_print_defaults \
&& test -x /opt/mysql/scripts/mysql_install_db \
&& test -x /opt/mysql/bin/mysqld_safe \
&& ln -s /opt/mysql /usr/local/mysql \
&& rm /tmp/mysql.tar.gz \
&& chown -R mysql:mysql /opt/mysql /var/lib/mysql /var/run/mysqld

COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh

RUN sed -i 's/\r$//' /usr/local/bin/docker-entrypoint.sh \
Expand Down
Loading