Continued:

- renamed jshop-ee-lib -> jshop-lib to follow "common" naming-convention
- jcore and jcore-swing are both JavaSE, maybe jcore is also compatible with
  JavaME, but both are *NEVER* compatible with JavaEE, so let's exclude them
  from any distribution lists

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

diff --git a/.jprojects.sh b/.jprojects.sh
index 1c32e0cb6d355f8392c5a5fca3ca706cf4037b16..07fd2ccc91d835748fa6e8d6332e2516164ef947 100644 (file)
--- a/.jprojects.sh
+++ b/.jprojects.sh
@@ -20,7 +20,7 @@ LIBRARIES="jcore jcoreee \
        jcore-swing \
        jcustomer-core jcustomer-lib \
        jproduct-core jproduct-lib \
        jcore-swing \
        jcustomer-core jcustomer-lib \
        jproduct-core jproduct-lib \

-       jshop-core jshop-ee-lib \
+       jshop-core jshop-lib \

        jshop-receipt-core jshop-receipt-lib"
 
 # Base application names (all)
        jshop-receipt-core jshop-receipt-lib"
 
 # Base application names (all)

diff --git a/dist.sh b/dist.sh
index 020632245ccde3fbe87beb4d42f945c31d16e8b3..fdd1e5d2f933f1c8742dcd4d8d771b38730ab9ab 100755 (executable)
--- a/dist.sh
+++ b/dist.sh
@@ -45,16 +45,21 @@ fi
 LIST=$(find ../*/lib/${NAME}.jar)
 LIST="${LIST} ${WILDFLY_MODULE_PATH}"
 
 LIST=$(find ../*/lib/${NAME}.jar)
 LIST="${LIST} ${WILDFLY_MODULE_PATH}"
 

-if [ -d "${GLASSFISH_BASE_PATH}" ]
+if [ "${NAME}" != "jcore" -a "${NAME}" != "jcore-swing" ]

 then
 then

-       echo "$0: Glassfish personal domain found, adding to LIST ..."
-       LIST="${LIST} ${GLASSFISH_BASE_PATH}"
-fi
+       if [ -d "${GLASSFISH_BASE_PATH}" ]
+       then
+               echo "$0: Glassfish personal domain found, adding to LIST ..."
+               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}"
+       if [ -d "${PERSONAL_DOMAIN_PATH}" ]
+       then
+               echo "$0: Personal domain found, adding to LIST ..."
+               LIST="${LIST} ${PERSONAL_DOMAIN_PATH}"
+       fi
+else
+       echo "$0: Not going to add '${NAME}' to distribution list, is JavaSE project."

 fi
 
 if [ ! -f "${DIST}" ]
 fi
 
 if [ ! -f "${DIST}" ]


@@ -82,13 +87,13 @@ do
        fi
 done
 
        fi
 done
 

-if [ -n "${GLASSFISH_SSH_USER}" -a -n "${GLASSFISH_SSH_SERVER}" -a -n "${GLASSFISH_SSH_PATH}" ]
+if [ "$1" = "r" -o "${NAME}" = "jcore" -o "${NAME}" = "jcore-swing" ]

 then
 then

-       if [ "$1" != "r" -a "${NAME}" != "jcore" -a "${NAME}" != "jcore-swing" ]
-       then
-               echo "$0: Copying to remote '${GLASSFISH_SSH_SERVER}' ..."
-               scp "${DIST}" "${GLASSFISH_SSH_USER}@${GLASSFISH_SSH_SERVER}:${GLASSFISH_SSH_PATH}" || exit 255
-       fi
+       echo "$0: Not uploading '${NAME}' or parameter 'r' provided."
+elif [ -n "${GLASSFISH_SSH_USER}" -a -n "${GLASSFISH_SSH_SERVER}" -a -n "${GLASSFISH_SSH_PATH}" ]
+then
+       echo "$0: Copying to remote '${GLASSFISH_SSH_SERVER}' ..."
+       scp "${DIST}" "${GLASSFISH_SSH_USER}@${GLASSFISH_SSH_SERVER}:${GLASSFISH_SSH_PATH}" || exit 255

 else
        echo "$0: SSH upload disabled."
 fi
 else
        echo "$0: SSH upload disabled."
 fi