X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=.jprojects.sh;h=d849f66215c4c3ab9abb429ee469e69483e1af77;hb=b48c58414019ab62dc5ae2f998f2fe4c308873c1;hp=a26eb3a02fc20bf7c677767eb13c0e8ec1a731e8;hpb=ea4b3dec8482c503ee8edeaaeac0b15209a07bb5;p=jprojects-scripts.git

diff --git a/.jprojects.sh b/.jprojects.sh
index a26eb3a..d849f66 100644
--- a/.jprojects.sh
+++ b/.jprojects.sh
@@ -1,19 +1,18 @@
 #!/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 \
 	juser-core juser-lib \
-	jaddressbook-core \
+	juser-activity-core juser-activity-lib \
 	jletter-core jletter-lib jletter-ejb \
-	jaddressbook-core \
+	jaddressbook-core jaddressbook-lib \
 	jmailer-ee \
 	jcore-swing \
 	jcustomer-core jcustomer-lib \
@@ -21,23 +20,35 @@ LIST="${LIST} \
 	jshop-receipt-lib jshop-receipt-ejb"
 
 # 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 pizzaservice-ejb pizzaservice-swing \
+	jjobs-core jjobs-lib jjobs-mailer jjobs-ejb jjobs-war jjobs \
+	addressbook-core addressbook-lib addressbook-mailer addressbook-ejb addressbook-war addressbook addressbook-uml"
 
-# BROKEN:
-LIST="${LIST} addressbook-swing"
+# Company-specific projects
+COMPANY_APPS="jrecruiter-core jrecruiter-lib jrecruiter-mailer jrecruiter-ejb jrecruiter-war jrecruiter"
+
+# Broken (needs fixing)
+BROKEN="addressbook-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`
+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 +57,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