Updated jar(s)

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/dist.sh b/dist.sh
index f48251e36059fd6bf0a0acb8832e9459060caac3..a0a77ede7c9cfd7d51d802a0c1dab98b3f18f683 100755 (executable)
--- 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/jcore.jar b/lib/jcore.jar
index 658854d4dcbdceca018177f9d92eeb1ef2778f37..a2972e6fc4702d5293d1c0b46b2a83acd92d9b29 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ

diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index 04245e48b4ed18906fe0e1e065f5f1bc39892333..8fa7868d036fb8592e8acfcd35cc661720d5984d 100644 (file)
Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ

diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar
index ea56c73bc63bf4cab1608f411734a62cb5d11379..e6837861a8023ca3b78ea4aecb52d00765c5e022 100644 (file)
Binary files a/lib/jshop-core.jar and b/lib/jshop-core.jar differ