Continued:

- line-feed is now LF which prevents converting
- updated dist.sh for better personal-domain support
- updated jar(s)

diff --git a/.gitattributes b/.gitattributes
index dfe0770424b2a19faf507a501ebfc23be8f54e7b..17cdcd5373ad22f616149f35b61236dfe81ebec3 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-# Auto detect text files and perform LF normalization
-* text=auto
+# Use Linux/Uni* line-feed for new lines (prevents converting)
+* text=lf

diff --git a/dist.sh b/dist.sh
index b74103bd5ef8d1d60f12bf88c5dd2ac62f89c63b..54fcb45ee6d5934048cb19c4ca4aff6d565785a4 100755 (executable)
--- a/dist.sh
+++ b/dist.sh
@@ -29,6 +29,7 @@ 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}" ]
@@ -37,6 +38,12 @@ 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."
@@ -44,17 +51,12 @@ 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}" ]
@@ -69,7 +71,7 @@ do
 
 done
 
-if [ "$1" != "r" -a -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" ]
+if [ -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/juser-core.jar b/lib/juser-core.jar
index 0caa78e5080bd8602d99888ea80611142cf4166d..64d6386ce2697cadba83157c21855b90afacec4c 100644 (file)
Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ