From 030bd17d27cd7dee8309d929ecc52f715b248494 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 19 Feb 2016 15:07:38 +0100 Subject: [PATCH] Updated jar(s) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- dist.sh | 57 +++++++++++++++++++++++++++++++++++++----- lib/jcountry-core.jar | Bin 6761 -> 6761 bytes 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dist.sh b/dist.sh index f48251e..a0a77ed 100755 --- a/dist.sh +++ b/dist.sh @@ -1,17 +1,50 @@ -#!/bin/sh +#!/bin/bash +# Name of this project, detected by it's base path NAME="${PWD##*/}" + +# Generated JAR file DIST="dist/${NAME}.jar" + +# WildFly module base path +WILDFLY_MODULE_BASE_PATH="${HOME}/wildfly_domain/modules/org/mxchange" + +# And for this "module" (as WildFly calls it) +WILDFLY_MODULE_PATH="${WILDFLY_MODULE_BASE_PATH}/${NAME}/main" + +# module.xml +WILDFLY_MODULE_XML_FILE="wildfly/module.xml" + +# Glassfish base path (domain) +GLASSFISH_BASE_PATH="${HOME}/gf_domain/lib" + +# Generate list LIST=`find ../*/lib/${NAME}.jar` LIST="${LIST} `find ../*/*-ejb/lib/${NAME}.jar`" -LIST="${LIST} ${HOME}/gf_domains/domain1/lib/" +LIST="${LIST} ${WILDFLY_MODULE_PATH}" + +if [ -d "${GLASSFISH_BASE_PATH}" ] +then + echo "$0: Glassfish personal domain found, adding to LIST ..." + LIST="${LIST} ${GLASSFISH_BASE_PATH}" +fi + +if [ ! -f "${DIST}" ] +then + echo "$0: '${DIST}' not found." + exit 1 +elif [ ! -d "${WILDFLY_MODULE_BASE_PATH}" ] +then + echo "$0: WildFly base path '${WILDFLY_MODULE_BASE_PATH}' not created." + exit 1 +elif [ ! -d "${WILDFLY_MODULE_PATH}" ] +then + mkdir -vp "${WILDFLY_MODULE_PATH}" +fi for target in ${LIST}; do - if [ ! -f "${DIST}" ] - then - echo "$0: '${DIST}' not found." - elif [ -d "${target}" ] + if [ -d "${target}" ] then cp -v "${DIST}" "${target}" elif [ -f "${target}" ] @@ -21,3 +54,15 @@ do echo "$0: Target '${target}' not found." fi done + +# Copy module.xml ... +if [ -f "${WILDFLY_MODULE_XML_FILE}" ] +then + echo "$0: Generating module.xml ..." + XML_CONTENT=`cat "${WILDFLY_MODULE_XML_FILE}"` + XML_CONTENT="${XML_CONTENT//NAME/$NAME}" + echo "${XML_CONTENT}" > "${WILDFLY_MODULE_PATH}/module.xml" +fi + +echo "$0: All done." +exit 0 diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar index 10b7658c78eec2a4b565bd8261d9a6ca88ff26d7..83d819e411c91323325ff9272829a572f6e94024 100644 GIT binary patch delta 140 zcmaE9^3sGiz?+$ci-CcIf#F0&@I+n>=Ho!hVm>p7cS{~j{m}qXlhqjw!E`jE8HnCI zg^`H`%$UhKUkEH?EnxxDKDkW79?ah%p%12C0mVTks7gA5=}bvCFuh4K7)*0WB?16_ CA~H4r delta 140 zcmaE9^3sGiz?+$ci-CcIfg!ZoeKn9mI2-I51We>6bUWOYVEFdfZk2BJ4l zVPs+fGiI{R7Xr&zOIU!kPcDs*;XiI#bdOOmC752Gbl;i2#*Q BD)s;X -- 2.39.5