Signed-off-by: Roland Haeder <roland@mxchange.org>
jcontacts-core jcontacts-business-core jcontacts-lib jcontacts-ejb \
juser-core juser-lib \
jletter-core jletter-lib jletter-ejb \
jcontacts-core jcontacts-business-core jcontacts-lib jcontacts-ejb \
juser-core juser-lib \
jletter-core jletter-lib jletter-ejb \
jcore-swing \
jshop-core jshop-ee-lib jshop-ejb \
jshop-receipt-lib jshop-receipt-ejb"
jcore-swing \
jshop-core jshop-ee-lib jshop-ejb \
jshop-receipt-lib jshop-receipt-ejb"
# Applications and their special libs/EJBs
LIST="${LIST}
pizzaservice-lib pizzaservice pizzaservice-swing pizzaservice-war \
# Applications and their special libs/EJBs
LIST="${LIST}
pizzaservice-lib pizzaservice pizzaservice-swing pizzaservice-war \
- jjobs-lib jjobs-ejb jjobs jjobs-war \
- addressbook-lib addressbook-ejb addressbook addressbook-war addressbook-uml"
+ jjobs-lib jjobs-mailer jjobs-ejb jjobs jjobs-war \
+ addressbook-lib addressbook-mailer addressbook-ejb addressbook addressbook-war addressbook-uml"
# Tools repository
LIST="${LIST} jprojects-scripts"
# Tools repository
LIST="${LIST} jprojects-scripts"
. ./.jprojects.sh || exit 255
for project in ${LIST}; do
. ./.jprojects.sh || exit 255
for project in ${LIST}; do
- if [ -f "${project}/dist.sh" ]
+ if [ "${project}" = "jprojects-scripts" ]
+ then
+ echo "$0: Skipping jprojects-scripts ..."
+ continue
+ elif [ -f "${project}/dist.sh" ]
then
echo "$0: Copying dist.sh to '${project}' ..."
cp -v dist.sh "${project}/" || exit 255
then
echo "$0: Copying dist.sh to '${project}' ..."
cp -v dist.sh "${project}/" || exit 255
if [ ! -d "${project}/docs" -o "$1" = "f" ]
then
echo "$0: GNU-ifying project '${project}' ..."
if [ ! -d "${project}/docs" -o "$1" = "f" ]
then
echo "$0: GNU-ifying project '${project}' ..."
- cp -rv docs "${project}/" || exit 255
+ mkdir --parent "${project}/docs" || exit 255
+ cp -rpv docs/* "${project}/docs/" || exit 255
cd "${JPROJECTS_HOME}/${project}"
echo "$0: git add ..."
git add docs || exit 255
cd "${JPROJECTS_HOME}/${project}"
echo "$0: git add ..."
git add docs || exit 255
GLASSFISH_BASE_PATH="${HOME}/gf_domain/domain/lib"
# Remote Glassfish path
GLASSFISH_BASE_PATH="${HOME}/gf_domain/domain/lib"
# Remote Glassfish path
-GLASSFISH_SSH_PATH="/var/glassfish/domains/domain1/lib"
+GLASSFISH_SSH_PATH="/var/payara/domains/domain1/lib"
# Remote SSH server (password-less access)
GLASSFISH_SSH_SERVER="www.mxchange.org"
# Remote SSH server (password-less access)
GLASSFISH_SSH_SERVER="www.mxchange.org"
UNWANTED_NAME="stick"
WANTED_NAME1="upstream"
WANTED_NAME2="daedalus"
UNWANTED_NAME="stick"
WANTED_NAME1="upstream"
WANTED_NAME2="daedalus"
+WANTED_NAME3="transport"
GIT_USER="quix0r"
GIT_SERVER="git.mxchange.org"
GIT_USER="quix0r"
GIT_SERVER="git.mxchange.org"
GIT_BRANCH="master"
GIT_ORIGIN="origin"
GIT_BRANCH="master"
GIT_ORIGIN="origin"
-MEDIA_NAME="INTENSO"
-MEDIA_PATH="Java Project"
+MEDIA_NAME1="INTENSO"
+MEDIA_NAME2="Transport"
+MEDIA_PATH="Java Project"
for project in ${LIST}; do
GIT_URL1="${GIT_USER}@${GIT_SERVER}:${GIT_PATH}/${project}.git"
GIT_URL2="${GIT_PATH}/${project}.git"
for project in ${LIST}; do
GIT_URL1="${GIT_USER}@${GIT_SERVER}:${GIT_PATH}/${project}.git"
GIT_URL2="${GIT_PATH}/${project}.git"
- echo "$0: GIT_URL1='${GIT_URL1}',GIT_URL2='${GIT_URL2}'"
+ GIT_URL3="${MEDIA_BASE}/${USER}/${MEDIA_NAME2}/${MEDIA_PATH}/${project}.git"
+ echo "$0: GIT_URL1='${GIT_URL1}',GIT_URL2='${GIT_URL2}',GIT_URL3='${GIT_URL3}'"
REMOTE_PUSH=`git remote -v | grep "push"`
echo "$0: REMOTE='${REMOTE}',REMOTE_PUSH='${REMOTE_PUSH}'"
REMOTE_PUSH=`git remote -v | grep "push"`
echo "$0: REMOTE='${REMOTE}',REMOTE_PUSH='${REMOTE_PUSH}'"
- MEDIA=`echo "${REMOTE_PUSH}" | grep "${MEDIA_BASE}/"`
- echo "$0: MEDIA='${MEDIA}'"
+ MEDIA1=`echo "${REMOTE_PUSH}" | grep "${MEDIA_BASE}/${USER}/${MEDIA_NAME1}/"`
+ echo "$0: MEDIA1='${MEDIA1}'"
- echo "$0: Found ${MEDIA_BASE}/ remote for '${project}'."
+ echo "$0: Found '${MEDIA_BASE}/${USER}/${MEDIA_NAME1}' remote for '${project}'."
if [ "${REMOTE}" = "${GIT_ORIGIN}" ]
then
echo "$0: Project '${project}' has already fixed '${GIT_ORIGIN}'."
if [ "${REMOTE}" = "${GIT_ORIGIN}" ]
then
echo "$0: Project '${project}' has already fixed '${GIT_ORIGIN}'."
fi
echo "$0: Adding '${GIT_ORIGIN}' to '${project}' ..."
fi
echo "$0: Adding '${GIT_ORIGIN}' to '${project}' ..."
- git remote add "${GIT_ORIGIN}" "${MEDIA_BASE}/${USER}/${MEDIA_NAME}/${MEDIA_PATH}/${project}.git" --track "${GIT_BRANCH}" || exit 255
+ git remote add "${GIT_ORIGIN}" "${MEDIA_BASE}/${USER}/${MEDIA_NAME1}/${MEDIA_PATH}/${project}.git" --track "${GIT_BRANCH}" || exit 255
else
echo "$0: Unknown remote '${REMOTE_PUSH}' found. Exiting ..."
exit 1
else
echo "$0: Unknown remote '${REMOTE_PUSH}' found. Exiting ..."
exit 1
if [ -n "${UNWANTED_REMOTE}" ]
then
if [ -n "${UNWANTED_REMOTE}" ]
then
- echo "$0: Found remote '${UNWANTED_NAME1}' in '${project}'. Renaming '${GIT_ORIGIN}'->'${WANTED_NAME1}' and '${UNWANTED_NAME1}'->'${GIT_ORIGIN}' ..."
+ echo "$0: Found remote '${UNWANTED_NAME}' in '${project}'. Renaming '${GIT_ORIGIN}'->'${WANTED_NAME1}' and '${UNWANTED_NAME}'->'${GIT_ORIGIN}' ..."
UPSTREAM_REMOTE=`git remote | grep "${WANTED_NAME1}"`
echo "$0: UPSTREAM_REMOTE='${UPSTREAM_REMOTE}'"
if [ -n "${UPSTREAM_REMOTE}" ]
then
UPSTREAM_REMOTE=`git remote | grep "${WANTED_NAME1}"`
echo "$0: UPSTREAM_REMOTE='${UPSTREAM_REMOTE}'"
if [ -n "${UPSTREAM_REMOTE}" ]
then
- echo "$0: Remotes '${UNWANTED_NAME1}' and '${WANTED_NAME1}' exist! Removing '${WANTED_NAME1}' ..."
+ echo "$0: Remotes '${UNWANTED_NAME}' and '${WANTED_NAME1}' exist! Removing '${WANTED_NAME1}' ..."
git remote rm "${WANTED_NAME1}" || exit 255
fi
git remote rename "${GIT_ORIGIN}" "${WANTED_NAME1}" || exit 255
git remote rm "${WANTED_NAME1}" || exit 255
fi
git remote rename "${GIT_ORIGIN}" "${WANTED_NAME1}" || exit 255
- git remote rename "${UNWANTED_NAME1}" "${GIT_ORIGIN}" || exit 255
+ git remote rename "${UNWANTED_NAME}" "${GIT_ORIGIN}" || exit 255
- echo "$0: No unwanted '${UNWANTED_NAME1}' remote in '${project}' ..."
+ echo "$0: No unwanted '${UNWANTED_NAME}' remote in '${project}' ..."
UPSTREAM_REMOTE1=`git remote | grep "${WANTED_NAME1}"`
UPSTREAM_REMOTE2=`git remote | grep "${WANTED_NAME2}"`
UPSTREAM_REMOTE1=`git remote | grep "${WANTED_NAME1}"`
UPSTREAM_REMOTE2=`git remote | grep "${WANTED_NAME2}"`
- echo "$0: UPSTREAM_REMOTE1='${UPSTREAM_REMOTE1}',UPSTREAM_REMOTE2='${UPSTREAM_REMOTE2}'"
+ UPSTREAM_REMOTE3=`git remote | grep "${WANTED_NAME3}"`
+ echo "$0: UPSTREAM_REMOTE1='${UPSTREAM_REMOTE1}',UPSTREAM_REMOTE2='${UPSTREAM_REMOTE2}',UPSTREAM_REMOTE3='${UPSTREAM_REMOTE3}'"
if [ -n "${UPSTREAM_REMOTE1}" ]
then
if [ -n "${UPSTREAM_REMOTE1}" ]
then
if [ -n "${UPSTREAM_REMOTE2}" ]
then
echo "$0: Remote '${WANTED_NAME2}' found in '${project}'."
if [ -n "${UPSTREAM_REMOTE2}" ]
then
echo "$0: Remote '${WANTED_NAME2}' found in '${project}'."
+ elif [ ! -d "${GIT_URL2}" ]
+ then
+ echo "$0: Remote '${WANTED_NAME2}' cannot be created, path '${GIT_URL2}' missing."
+ exit 1
else
echo "$0: No wanted '${WANTED_NAME2}' in '${project}'. Adding ..."
git remote add "${WANTED_NAME2}" "${GIT_URL2}" --track "${GIT_BRANCH}" || exit 255
fi
else
echo "$0: No wanted '${WANTED_NAME2}' in '${project}'. Adding ..."
git remote add "${WANTED_NAME2}" "${GIT_URL2}" --track "${GIT_BRANCH}" || exit 255
fi
+
+ if [ -n "${UPSTREAM_REMOTE3}" ]
+ then
+ echo "$0: Remote '${WANTED_NAME3}' found in '${project}'."
+ elif [ ! -d "${GIT_URL3}" ]
+ then
+ echo "$0: Remote '${WANTED_NAME3}' cannot be created, path '${GIT_URL3}' missing."
+ exit 1
+ else
+ echo "$0: No wanted '${WANTED_NAME3}' in '${project}'. Adding ..."
+ git remote add "${WANTED_NAME3}" "${GIT_URL3}" --track "${GIT_BRANCH}" || exit 255
+ fi
. ./.jprojects.sh || exit 255
. ./.jprojects.sh || exit 255
+TARGETS="d t u"
+
+if [ "$1" = "a" ]
+then
+ cd "${JPROJECTS_HOME}"
+ for TARGET in ${TARGETS}; do
+ echo "$0: Pushing for target '${TARGET}' ..."
+ $0 "${TARGET}" "1"
+ done
+
+ echo "$0: Pushed to all targets."
+ exit 0
+fi
+
for ENTRY in ${LIST}; do
echo "$0: Pushing '${ENTRY}' ..."
for ENTRY in ${LIST}; do
echo "$0: Pushing '${ENTRY}' ..."
- cd "${ENTRY}" || exit 255
- git push --all
- if [ "$1" = "u" ]
+ cd "${JPROJECTS_HOME}/${ENTRY}" || exit 255
+
+ if [ -z "$2" ]
- git push --all upstream
- elif [ "$1" = "d" ]
+ git push --all
+ fi
+
+ if [ "$1" = "d" ]
then
git push --all daedalus
then
git push --all daedalus
+ elif [ "$1" = "t" ]
+ then
+ git push --all transport
+ elif [ "$1" = "u" ]
+ then
+ git push --all upstream