Added REST functionality for the Bill. RabbitMQProducer was refined. UserActor sends...

[aquarium] / make-dist.sh

diff --git a/make-dist.sh b/make-dist.sh
index 4ae8854..144384f 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -49,6 +49,8 @@ P_BUILD="normal"
 P_KEEPDIST="no"
 P_FAKEIT="no"
 P_ARCHIVE=""
 P_KEEPDIST="no"
 P_FAKEIT="no"
 P_ARCHIVE=""

+P_OFFLINE="no"
+MVN_OPTS=""

 
 verbose() {
   if [ "$P_VERBOSE" = "yes" ]; then
 
 verbose() {
   if [ "$P_VERBOSE" = "yes" ]; then

@@ -62,6 +64,7 @@ verbose_p() {
   verbose "Keep dist/ folder   :" $P_KEEPDIST
   verbose "Custom achive name  :" $P_ARCHIVE
   verbose "Fake it             :" $P_FAKEIT
   verbose "Keep dist/ folder   :" $P_KEEPDIST
   verbose "Custom achive name  :" $P_ARCHIVE
   verbose "Fake it             :" $P_FAKEIT

+  verbose "maven offline mode  :" $P_OFFLINE

 }
 
 fail() {
 }
 
 fail() {

@@ -101,7 +104,8 @@ clean() {
     echo "=== mvn clean ================="
     echo "==============================="
     echo
     echo "=== mvn clean ================="
     echo "==============================="
     echo

-    mvn clean || fail "cleaning compilation artifacts"
+    echo mvn ${MVN_OPTS} clean
+    mvn ${MVN_OPTS} clean || fail "cleaning compilation artifacts"

     echo
   elif [ "$P_BUILD"="fast" ]; then
     echo
     echo
   elif [ "$P_BUILD"="fast" ]; then
     echo

@@ -113,7 +117,12 @@ clean() {
 }
 
 collectdeps() {
 }
 
 collectdeps() {

-  mvn dependency:copy-dependencies && cp target/dependency/*.jar $DIST/lib || fail "collecting dependencies"
+  if [ "$P_BUILD" = "normal" ]; then
+    echo mvn ${MVN_OPTS} dependency:copy-dependencies
+    mvn ${MVN_OPTS} dependency:copy-dependencies
+  fi
+
+  cp target/dependency/*.jar $DIST/lib || fail "collecting dependencies"

 }
 
 build() {
 }
 
 build() {

@@ -122,7 +131,8 @@ build() {
   echo "=== mvn package ==============="
   echo "==============================="
   echo
   echo "=== mvn package ==============="
   echo "==============================="
   echo

-  mvn package -DskipTests && {
+  echo mvn ${MVN_OPTS} package -DskipTests
+  mvn ${MVN_OPTS} package -DskipTests && {

     echo
     echo "Copying Aquarium classes"
     aquariumjar=`find target -type f|egrep "aquarium-[0-9\.]+(-SNAPSHOT)?\.jar"`
     echo
     echo "Copying Aquarium classes"
     aquariumjar=`find target -type f|egrep "aquarium-[0-9\.]+(-SNAPSHOT)?\.jar"`

@@ -134,9 +144,8 @@ collectconf() {
   echo
   echo Copying config files from $CONF_SRC
   echo
   echo
   echo Copying config files from $CONF_SRC
   echo

-  cp $CONF_SRC/logback.xml $DIST/conf|| fail "copying logback.xml"
-  cp $CONF_SRC/policy.yaml $DIST/conf || fail "copying policy.yaml"
-  cp $CONF_SRC/roles-agreements.map $DIST/conf || fail "copying roles-agreements.map"
+  cp $CONF_SRC/policy.json $DIST/conf          || fail "copying policy.json"
+#  cp $CONF_SRC/roles-agreements.map $DIST/conf || fail "copying roles-agreements.map"

 
   if [ -n "$P_PROPS" ]; then
     cp $P_PROPS $DIST/conf/aquarium.properties || fail "copying $P_PROPS"
 
   if [ -n "$P_PROPS" ]; then
     cp $P_PROPS $DIST/conf/aquarium.properties || fail "copying $P_PROPS"

@@ -152,7 +161,6 @@ collectscripts() {
   cp $SERVER_SCRIPTS_SRC/aquarium.sh $DIST/bin || fail "copying aquarium.sh"
   cp $SERVER_SCRIPTS_SRC/start.sh $DIST/bin || fail "copying start.sh"
   cp $SERVER_SCRIPTS_SRC/stop.sh $DIST/bin || fail "copying stop.sh"
   cp $SERVER_SCRIPTS_SRC/aquarium.sh $DIST/bin || fail "copying aquarium.sh"
   cp $SERVER_SCRIPTS_SRC/start.sh $DIST/bin || fail "copying start.sh"
   cp $SERVER_SCRIPTS_SRC/stop.sh $DIST/bin || fail "copying stop.sh"

-  cp $SERVER_SCRIPTS_SRC/test.sh $DIST/bin || fail "copying test.sh"

 }
 
 gitmark() {
 }
 
 gitmark() {

@@ -188,12 +196,13 @@ usage() {
   echo "  -k        Keep generated dist folder."
   echo "  -h        Show this message."
   echo "  -n        As in make -n."
   echo "  -k        Keep generated dist folder."
   echo "  -h        Show this message."
   echo "  -n        As in make -n."

+  echo "  -o        Use mvn in offline mode (--offline, -o)"

   echo "  -v        Be verbose."
 
   exit 0
 }
 
   echo "  -v        Be verbose."
 
   exit 0
 }
 

-while getopts ":a:b:hkc:nv" opt
+while getopts ":a:b:hkc:nov" opt

 do
   case $opt in
     a) P_ARCHIVE=$OPTARG
 do
   case $opt in
     a) P_ARCHIVE=$OPTARG

@@ -208,6 +217,8 @@ do
     ;;
     n) P_FAKEIT="yes"
     ;;
     ;;
     n) P_FAKEIT="yes"
     ;;

+    o) P_OFFLINE="yes"; MVN_OPTS="-o"
+    ;;

     v) P_VERBOSE="yes"
     ;;
     :) ERROR="Option -$OPTARG requires an argument. Aborting..."
     v) P_VERBOSE="yes"
     ;;
     :) ERROR="Option -$OPTARG requires an argument. Aborting..."

@@ -248,4 +259,4 @@ collectconf       && \
 collectscripts    && \
 gitmark           && \
 archive           && \
 collectscripts    && \
 gitmark           && \
 archive           && \

-removedist $P_KEEPDIST
\ No newline at end of file
+removedist $P_KEEPDIST