X-Git-Url: https://git.mxchange.org/?p=jprojects-scripts.git;a=blobdiff_plain;f=.jprojects.sh;h=4f2740b5cd58cc9e8836bd8972bd33576da12dde;hp=a6efbe2a11ed9951f1535e16a676ab6b13a70ad0;hb=4d9dc9a4e25cfe372b6d853b31bf1afffa33dc2b;hpb=a621099b84948e99f2e9a333af64e3efa464e78b

diff --git a/.jprojects.sh b/.jprojects.sh
index a6efbe2..4f2740b 100644
--- a/.jprojects.sh
+++ b/.jprojects.sh
@@ -1,46 +1,62 @@
 #!/bin/bash
 
-# Tools repository
-LIST="jprojects-scripts"
+# Tools repository (this)
+THIS="jprojects-scripts"
 
 # Libraries and EJBs
-LIST="${LIST} \
-	jcore jcoreee \
+LIBRARIES="jcore-utils jcore jcoreee \
 	jcore-logger-lib jcore-logger-ejb \
 	jcountry-core jcountry-lib \
 	jphone-core jphone-lib \
-	jcontacts-core jcontacts-business-core jcontacts-lib \
+	jcontacts-core jcontacts-lib \
+	jcontacts-business-core jcontacts-business-lib \
 	juser-core juser-lib \
+	juser-login-core juser-login-lib \
 	juser-activity-core juser-activity-lib \
-	jletter-core jletter-lib jletter-ejb \
+	jletter-core jletter-lib \
 	jaddressbook-core jaddressbook-lib \
+	jaddressbook-share-core jaddressbook-share-lib \
 	jmailer-ee \
 	jcore-swing \
 	jcustomer-core jcustomer-lib \
-	jshop-core jshop-ee-lib jshop-ejb \
-	jshop-receipt-lib jshop-receipt-ejb"
+	jproduct-core jproduct-lib \
+	jshop-core jshop-lib \
+	jshop-receipt-core jshop-receipt-lib"
+
+# Base application names (all)
+BASE_APPLICATION_NAMES="addressbook jfinancials jjobs jtrainings pizzaservice"
 
 # Applications and their special libs/EJBs
-LIST="${LIST}
-	pizzaservice-core pizzaservice-lib pizzaservice-mailer pizzaservice-ejb pizzaservice-swing \
-	jjobs-core jjobs-lib jjobs-mailer jjobs-ejb jjobs-war jjobs \
-	jrecruiter-core jrecruiter-lib jrecruiter-mailer jrecruiter-ejb jrecruiter-war jrecruiter \
-	jratecalc-core jratecalc-lib jratecalc-mailer jratecalc-ejb jratecalc-war jratecalc \
-	jlandingpage-core jlandingpage-lib jlandingpage-mailer jlandingpage-ejb jlandingpage-war jlandingpage \
-	jreports-core jreports-lib jreports-mailer jreports-ejb jreports-war jreports \
-	addressbook-core addressbook-lib addressbook-mailer addressbook-ejb addressbook-war addressbook addressbook-uml"
-
-# BROKEN:
-LIST="${LIST} addressbook-swing pizzaservice-war pizzaservice"
+APPLICATIONS="pizzaservice-core pizzaservice-lib pizzaservice-mailer-ejb pizzaservice-mailer-lib pizzaservice-ejb pizzaservice-swing \
+	jjobs-core jjobs-lib jjobs-mailer-ejb jjobs-mailer-lib jjobs-ejb jjobs-war jjobs \
+	jfinancials-core jfinancials-lib jfinancials-mailer-ejb jfinancials-mailer-lib jfinancials-ejb jfinancials-war jfinancials
+	addressbook-core addressbook-lib addressbook-mailer-ejb addressbook-mailer-lib addressbook-ejb addressbook-war addressbook addressbook-uml"
+
+# Company-specific projects
+COMPANY_APPS="jtrainings-core jtrainings-lib jtrainings-mailer-ejb jtrainings-mailer-lib jtrainings-ejb jtrainings-war jtrainings"
+
+# Broken (needs fixing)
+BROKEN="addressbook-swing jfinancials-swing jtrainings-swing pizzaservice-war pizzaservice"
+
+# Compile list
+ALL_PROJECTS="${THIS} ${LIBRARIES} ${APPLICATIONS} ${COMPANY_APPS} ${BROKEN}"
 
 # Own home directory
 declare -r JPROJECTS_HOME="${PWD}"
 
 # ant binary
-ANT_BIN=`which ant 2>/dev/null`
+ANT_BIN=$(which ant 2>/dev/null)
+
+# Check binary
+if [ -z "${ANT_BIN}" ]
+then
+	echo "$0: Cannot find ANT binary."
+	exit 1
+fi
 
 # Test on .git availability"
-for project in ${LIST}; do
+LIST=""
+for project in ${ALL_PROJECTS}; do
 	if [ ! -d "${project}" ]
 	then
 		echo "$0: Project '${project}' not created."
@@ -49,4 +65,7 @@ for project in ${LIST}; do
 		echo "$0: Project '${project}' is no GIT project."
 		exit 1
 	fi
+
+	# Add it as available
+	LIST="${LIST} ${project}"
 done