Cotinued:

- updated dist.st: skip wild-fly creation if path not found
- updated jar(s)

diff --git a/dist.sh b/dist.sh
index 54fcb45ee6d5934048cb19c4ca4aff6d565785a4..b74103bd5ef8d1d60f12bf88c5dd2ac62f89c63b 100755 (executable)
--- a/dist.sh
+++ b/dist.sh
@@ -29,7 +29,6 @@ PERSONAL_DOMAIN_PATH="${HOME}/personal_domain/lib"
 
 # Generate list
 LIST=`find ../*/lib/${NAME}.jar`
-LIST="${LIST} `find ../*/*-ejb/lib/${NAME}.jar`"
 LIST="${LIST} ${WILDFLY_MODULE_PATH}"
 
 if [ -d "${GLASSFISH_BASE_PATH}" ]
@@ -38,12 +37,6 @@ then
        LIST="${LIST} ${GLASSFISH_BASE_PATH}"
 fi
 
-if [ -d "${PERSONAL_DOMAIN_PATH}" ]
-then
-       echo "$0: Personal domain found, adding to LIST ..."
-       LIST="${LIST} ${PERSONAL_DOMAIN_PATH}"
-fi
-
 if [ ! -f "${DIST}" ]
 then
        echo "$0: '${DIST}' not found."
@@ -51,12 +44,17 @@ then
 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
 
+if [ -d "${PERSONAL_DOMAIN_PATH}" ]
+then
+       echo "$0: Personal domain found, copying file '${DIST}' ..."
+       cp -v "${DIST}" "${PERSONAL_DOMAIN_PATH}"
+fi
+
 for project in ${LIST};
 do
        if [ -d "${project}" ]
@@ -71,7 +69,7 @@ do
 
 done
 
-if [ -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" ]
+if [ "$1" != "r" -a -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" ]
 then
        echo "$0: Copying to remote '${GLASSFISH_SSH_SERVER}' ..."
        scp "${DIST}" "${GLASSFISH_SSH_SERVER}:${GLASSFISH_SSH_PATH}"

diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
index 8421ff371fba35b6b49565f9033db9129f9fa80d..ad4d408e75d2f4ff70b0f64e5db0987575c01918 100644 (file)
Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ

diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar
index d066cb3bc6e0a23c6fd9bf782735639902172b45..b26a4ded3c3d45622294c5f90012db5cd967dcd7 100644 (file)
Binary files a/lib/jcountry-core.jar and b/lib/jcountry-core.jar differ

diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar
index 412151183b1e8df79a1bfcf16d84ed0aee672d82..f61cf885eebe4b8c1b174e893607135fff74914d 100644 (file)
Binary files a/lib/jphone-core.jar and b/lib/jphone-core.jar differ

diff --git a/lib/juser-core.jar b/lib/juser-core.jar
index 07acdec300c73fda85315fa9de7294503405372f..0caa78e5080bd8602d99888ea80611142cf4166d 100644 (file)
Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ