X-Git-Url: https://git.mxchange.org/?p=jprojects-scripts.git;a=blobdiff_plain;f=.jprojects.sh;h=1c32e0cb6d355f8392c5a5fca3ca706cf4037b16;hp=0439f33a11ea640c7c7e538a26df5937c0f900b4;hb=51165e309fed310fba70f240f9142ed730b74c3f;hpb=753cd8c249223873165e4811b873b6419c0f9bd1

diff --git a/.jprojects.sh b/.jprojects.sh
index 0439f33..1c32e0c 100644
--- a/.jprojects.sh
+++ b/.jprojects.sh
@@ -1,43 +1,62 @@
 #!/bin/bash
 
-# Tools repository
-LIST="jprojects-scripts"
+# Tools repository (this)
+THIS="jprojects-scripts"
 
 # Libraries and EJBs
-LIST="${LIST} \
-	jcore jcoreee \
+LIBRARIES="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 \
-	jaddressbook-core \
-	jletter-core jletter-lib jletter-ejb \
+	juser-login-core juser-login-lib \
+	juser-activity-core juser-activity-lib \
+	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-ee-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 pizzaservice-swing pizzaservice-war \
-	jjobs-lib jjobs-mailer jjobs-ejb jjobs jjobs-war \
-	jratecalc-lib jratecalc-core jratecalc-mailer jratecalc-ejb jratecalc jratecalc-war \
-	addressbook-core addressbook-lib addressbook-mailer addressbook-ejb addressbook addressbook-war addressbook-uml"
+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"
 
-# BROKEN:
-LIST="${LIST} addressbook-swing"
+# Compile list
+ALL_PROJECTS="${THIS} ${LIBRARIES} ${APPLICATIONS} ${COMPANY_APPS} ${BROKEN}"
 
 # Own home directory
 declare -r JPROJECTS_HOME="${PWD}"
 
 # ant binary
-ANT_BIN=`which ant`
+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."
@@ -46,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