Enhance distribution package

modaclouds · Jun 3, 2015 · e8c33d7 · e8c33d7
1 parent 4b9d881
commit e8c33d7
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 3 deletions.
diff --git a/bin/make-dist.sh b/bin/make-dist.sh
@@ -4,17 +4,46 @@ if [ "$0" != "bin/make-dist.sh" ]; then
         exit 1
 fi
 
-DESTDIR=sla-service/target
+DESTDIR=dist/target
 DESTFILE=sla-service.tar.gz
 SOURCEFILE=sla-service.war
 
-mvn clean package
+#mvn clean package
 
+if [ -e "$DESTDIR" ]; then
+        echo "Directory $DESTDIR exists. You must remove it by hand"
+        exit 2
+fi
+
+mkdir "$DESTDIR"
 
-cd $DESTDIR
+cd sla-service/target
 
 tar cvzf "$DESTFILE" "$SOURCEFILE"
 
 cd -
 
+mv sla-service/target/$DESTFILE $DESTDIR
+
 echo "Resulting $DESTFILE is in $DESTDIR"
+
+MOSDIR="$DESTDIR/mos"
+MOSFILE=sla-core-distribution.tar.gz
+
+rm -Rf "$MOSDIR"
+mkdir "$MOSDIR"
+mkdir "$MOSDIR/bin"
+mkdir "$MOSDIR/etc"
+mkdir "$MOSDIR/lib"
+mkdir "$MOSDIR/share"
+
+
+cp sla-service/target/dependency/jetty-runner.jar $MOSDIR/lib
+cp sla-service/target/sla-service.war $MOSDIR/lib
+cp dist/bin/restoreDatabase.sh $MOSDIR/bin
+cp sla-repository/src/main/resources/sql/database.sql $MOSDIR/share
+cp sla-repository/src/main/resources/sql/atossla.sql $MOSDIR/share/schema.sql
+
+tar -cvzf $DESTDIR/$MOSFILE -C $MOSDIR .
+
+echo "mOS package $MOSFILE is in $DESTDIR"
diff --git a/dist/bin/restoreDatabase.sh b/dist/bin/restoreDatabase.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+DIR=$(cd "$(dirname "$0")" && pwd)
+
+SCHEMA="$DIR/../share/schema.sql"
+
+MODACLOUDS_MYSQL_IP=${MODACLOUDS_MYSQL_IP:-127.0.0.1}
+MODACLOUDS_MYSQL_PORT=${MODACLOUDS_MYSQL_PORT:-3306}
+MODACLOUDS_MYSQL_DB=${MODACLOUDS_MYSQL_DB:-atossla}
+MODACLOUDS_MYSQL_USERNAME=${MODACLOUDS_MYSQL_USERNAME:-atossla}
+MODACLOUDS_MYSQL_PASSWORD=${MODACLOUDS_MYSQL_PASSWORD:-_atossla_}
+
+echo "Cleaning database: DB='$MODACLOUDS_MYSQL_DB' USER='$MODACLOUDS_MYSQL_USERNAME'"
+mysql --host="${MODACLOUDS_MYSQL_IP}" --port="${MODACLOUDS_MYSQL_PORT}" \
+	-p"${MODACLOUDS_MYSQL_PASSWORD}" -u "${MODACLOUDS_MYSQL_USERNAME}" "${MODACLOUDS_MYSQL_DB}" < "$SCHEMA"
+
diff --git a/sla-repository/src/main/resources/sql/database.sql b/sla-repository/src/main/resources/sql/database.sql
@@ -0,0 +1,6 @@
+-- Default database and user initialization
+CREATE DATABASE IF NOT EXISTS atossla;
+CREATE USER atossla@'%' IDENTIFIED BY '_atossla_';
+CREATE USER atossla@'localhost' IDENTIFIED BY '_atossla_';
+GRANT ALL PRIVILEGES ON atossla.* TO atossla@'%';
+GRANT ALL PRIVILEGES ON atossla.* TO atossla@'localhost';