Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 3407

Timestamp:

11/30/11 13:53:55

Author:

douglm

Message:

(Partial updates as full update failed with some conflict)

Major refactoring of code to move all jar building into separate projects outside of the main bedework project which itself becomes an assembly project - that is it builds deployable components from the jars and other information.

This change is to facilitate the move to jboss 7.

Further changes are needed but probably no more major reorganization.

Files:

trunk/build/buildTools/deftasks.xml (modified) (2 diffs)
trunk/build/bw-deployutil-3.7.jar (deleted)
trunk/build/bw-deployutil-3.8.jar (modified) (previous)
trunk/build/quickstart/linux/bw (modified) (12 diffs)
trunk/build/src (deleted)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/build/buildTools/deftasks.xml

r3327	r3407
241	241	================================================================= -->
242	242	<target name="deep-clean" depends="clean">
243		~~<delete dir="${lib.dir}" />~~
244	243	</target>
245	244
…	…
249	248	<target name="clean">
250	249	<delete dir="${dist.home}" />
	250	<delete dir="${lib.dir}" />
251	251	</target>
252	252

trunk/build/quickstart/linux/bw

r3399	r3407
21	21
22	22	# Projects we need to update
23		updateProjects="bwxml rpiutil access davutil webdav caldav bedework bedework-carddav bwtzsvr cachedfeeder"
	23	updateProjects="access"
	24	updateProjects="$updateProjects bedework"
	25	updateProjects="$updateProjects bedework-carddav"
	26	updateProjects="$updateProjects bwannotations"
	27	updateProjects="$updateProjects bwcalcore"
	28	updateProjects="$updateProjects bwcaldav"
	29	updateProjects="$updateProjects bwcalFacade"
	30	updateProjects="$updateProjects bwdeployutil"
	31	updateProjects="$updateProjects bwical"
	32	updateProjects="$updateProjects bwinterfaces"
	33	updateProjects="$updateProjects bwmisc"
	34	updateProjects="$updateProjects bwsysevents"
	35	updateProjects="$updateProjects bwtzsvr"
	36	updateProjects="$updateProjects bwwebapps"
	37	updateProjects="$updateProjects bwxml"
	38	updateProjects="$updateProjects cachedfeeder"
	39	updateProjects="$updateProjects caldav"
	40	updateProjects="$updateProjects davutil"
	41	updateProjects="$updateProjects dumprestore"
	42	updateProjects="$updateProjects indexer"
	43	updateProjects="$updateProjects rpiutil"
	44	updateProjects="$updateProjects synch"
	45	updateProjects="$updateProjects webdav"
24	46
25	47	# Projects we will build - pkgdefault (bedework) is built if nothing specified
…	…
28	50	bedework=
29	51	bwannotations=
	52	bwcalcore=
	53	bwcaldav=
	54	bwcalfacade=
	55	bwdeployutil=
	56	bwicalendar=
	57	bwinterfaces=
	58	bwmisc=
	59	bwsysevents=
30	60	bwtools=
	61	bwwebapps=
31	62	bwxml=
32	63	caldav=
…	…
36	67	client=
37	68	davutil=
	69	dumprestore=
	70	indexer=
38	71	monitor=
39	72	naming=
…	…
96	129	echo " target Ant target to execute"
97	130	echo ""
98		echo " PROJECT optionally defines the package to build and is one of"
	131	echo " PROJECT optionally defines the package to build. If omitted the main"
	132	echo " bedework calendar system will be built otherwise it is one of"
99	133	echo " the core, ancillary or experimental targets below:"
100	134	echo ""
101		echo " Core projects: required for a functioning system"
102		echo " -access Target is for the access classes"
103		echo " -bwxml Target is for the Bedework XML schemas build"
104		echo " (usually built automatically be dependent projects"
105		echo " -caldav Target is for the CalDAV build"
106		echo " -carddav Target is for the CardDAV build"
	135	echo " Core sub-projects: required for a functioning system"
	136	echo " -access Target is for the access classes"
	137	echo " -bwann Target is for the annotation classes"
	138	echo " -bwcalcore Target is for the bedework core api implementation"
	139	echo " -bwcaldav Target is for the bedework CalDAV implementation"
	140	echo " -bwcalfacade Target is for the bedework api interface classes"
	141	echo " -bwicalendar Target is for the bedework icalendar classes"
	142	echo " -bwinterfaces Target is for the bedework service and api interfaces"
	143	echo " -bwmisc Target is for misc classes"
	144	echo " -bwsysevents Target is for the system JMS event classes"
	145	echo " -bwwebapps Target is for the bedework web ui classes"
	146	echo " -bwxml Target is for the Bedework XML schemas build"
	147	echo " (usually built automatically be dependent projects"
	148	echo " -caldav Target is for the generic CalDAV server"
	149	echo " -carddav Target is for the CardDAV build"
107	150	echo " -carddav deploy-addrbook To deploy the Javascript Addressbook client."
108		echo " -davutil Target is for the Bedework dav util classes"
109		echo " -rpiutil Target is for the Bedework util classes"
110		echo " -tzsvr Target is for the timezones server build"
111		echo " -webdav Target is for the WebDAV build"
	151	echo " -davutil Target is for the Bedework dav util classes"
	152	echo " -dumprestore Target is for the Bedework dump/restore service"
	153	echo " -indexer Target is for the Bedework indexer service"
	154	echo " -rpiutil Target is for the Bedework util classes"
	155	echo " -synch Target is for the synch build"
	156	echo " -tzsvr Target is for the timezones server build"
	157	echo " -webdav Target is for the WebDAV build"
112	158	echo " Ancillary projects: not required"
113		echo " -bwtools Target is for the Bedework tools build"
114		echo " -caldavTest Target is for the CalDAV Test build"
115		echo " -monitor Target is for the bedework monitor application"
116		echo " -testsuite Target is for the bedework test suite"
	159	echo " -bwtools Target is for the Bedework tools build"
	160	echo " -caldavTest Target is for the CalDAV Test build"
	161	echo " -deployutil Target is for the Bedework deployment classes"
	162	echo " -monitor Target is for the bedework monitor application"
	163	echo " -testsuite Target is for the bedework test suite"
117	164	echo " Experimental projects: no guarantees"
118		echo " -catsvr Target is for the Catsvr build"
119		echo " -client Target is for the bedework client application build"
120		echo " -synch Target is for the synch build"
121		echo " -naming Target is for the abstract naming api"
122		echo " The default is a calendar build"
	165	echo " -catsvr Target is for the Catsvr build"
	166	echo " -client Target is for the bedework client application build"
	167	echo " -naming Target is for the abstract naming api"
123	168	echo ""
124	169	echo " Invokes ant to build or deploy the Bedework system. Uses a configuration"
…	…
199	244	# projects
200	245
	246	if [ "$bwdeployutil" != "" ] ; then
	247	cd $QUICKSTART_HOME/bwdeployutil
	248	bwdeployutil=
	249	return
	250	fi
	251
	252	if [ "$bwxml" != "" ] ; then
	253	cd $QUICKSTART_HOME/bwxml
	254	bwxml=
	255	return
	256	fi
	257
	258	if [ "$rpiutil" != "" ] ; then
	259	cd $QUICKSTART_HOME/rpiutil
	260	rpiutil=
	261	return
	262	fi
	263
	264	if [ "$access" != "" ] ; then
	265	cd $QUICKSTART_HOME/access
	266	access=
	267	return
	268	fi
	269
	270	if [ "$davutil" != "" ] ; then
	271	cd $QUICKSTART_HOME/davutil
	272	davutil=
	273	return
	274	fi
	275
	276	if [ "$webdav" != "" ] ; then
	277	cd $QUICKSTART_HOME/webdav
	278	webdav=
	279	return
	280	fi
	281
	282	if [ "$caldav" != "" ] ; then
	283	cd $QUICKSTART_HOME/caldav
	284	caldav=
	285	return
	286	fi
	287
	288	if [ "$caldavTest" != "" ] ; then
	289	cd $QUICKSTART_HOME/caldavTest
	290	caldavTest=
	291	return
	292	fi
	293
	294	if [ "$carddav" != "" ] ; then
	295	cd $QUICKSTART_HOME/bedework-carddav
	296	carddav=
	297	return
	298	fi
	299
201	300	if [ "$bwannotations" != "" ] ; then
202	301	cd $QUICKSTART_HOME/bwannotations
…	…
205	304	fi
206	305
207		if [ "$bwxml" != "" ] ; then
208		cd $QUICKSTART_HOME/bwxml
209		bwxml=
210		return
211		fi
212
213		if [ "$rpiutil" != "" ] ; then
214		cd $QUICKSTART_HOME/rpiutil
215		rpiutil=
216		return
217		fi
218
219		if [ "$access" != "" ] ; then
220		cd $QUICKSTART_HOME/access
221		access=
222		return
223		fi
224
225		if [ "$davutil" != "" ] ; then
226		cd $QUICKSTART_HOME/davutil
227		davutil=
228		return
229		fi
230
231		if [ "$webdav" != "" ] ; then
232		cd $QUICKSTART_HOME/webdav
233		webdav=
234		return
235		fi
236
237		if [ "$caldav" != "" ] ; then
238		cd $QUICKSTART_HOME/caldav
239		caldav=
240		return
241		fi
242
243		if [ "$caldavTest" != "" ] ; then
244		cd $QUICKSTART_HOME/caldavTest
245		caldavTest=
246		return
247		fi
248
249		if [ "$carddav" != "" ] ; then
250		cd $QUICKSTART_HOME/bedework-carddav
251		carddav=
	306	if [ "$bwcalfacade" != "" ] ; then
	307	cd $QUICKSTART_HOME/bwcalFacade
	308	bwcalfacade=
	309	return
	310	fi
	311
	312	if [ "$bwinterfaces" != "" ] ; then
	313	cd $QUICKSTART_HOME/bwinterfaces
	314	bwinterfaces=
	315	return
	316	fi
	317
	318	if [ "$bwsysevents" != "" ] ; then
	319	cd $QUICKSTART_HOME/bwsysevents
	320	bwsysevents=
	321	return
	322	fi
	323
	324	if [ "$bwicalendar" != "" ] ; then
	325	cd $QUICKSTART_HOME/bwical
	326	bwicalendar=
	327	return
	328	fi
	329
	330	if [ "$bwmisc" != "" ] ; then
	331	cd $QUICKSTART_HOME/bwmisc
	332	bwmisc=
	333	return
	334	fi
	335
	336	if [ "$bwwebapps" != "" ] ; then
	337	cd $QUICKSTART_HOME/bwwebapps
	338	bwwebapps=
	339	return
	340	fi
	341
	342	if [ "$bwcaldav" != "" ] ; then
	343	cd $QUICKSTART_HOME/bwcaldav
	344	bwcaldav=
	345	return
	346	fi
	347
	348	if [ "$bwcalcore" != "" ] ; then
	349	cd $QUICKSTART_HOME/bwcalcore
	350	bwcalcore=
	351	return
	352	fi
	353
	354	if [ "$catsvr" != "" ] ; then
	355	cd $QUICKSTART_HOME/catsvr
	356	catsvr=
	357	return
	358	fi
	359
	360	if [ "$client" != "" ] ; then
	361	cd $QUICKSTART_HOME/bwclient
	362	client=
	363	return
	364	fi
	365
	366	if [ "$indexer" != "" ] ; then
	367	cd $QUICKSTART_HOME/indexer
	368	indexer=
	369	return
	370	fi
	371
	372	if [ "$dumprestore" != "" ] ; then
	373	cd $QUICKSTART_HOME/dumprestore
	374	dumprestore=
252	375	return
253	376	fi
…	…
256	379	cd $QUICKSTART_HOME
257	380	bedework=
258		~~return~~
259		fi
260
261		~~if [ "$catsvr" != "" ] ; then~~
262		~~cd $QUICKSTART_HOME/catsvr~~
263		~~catsvr=~~
264		~~return~~
265		fi
266
267		~~if [ "$client" != "" ] ; then~~
268		~~cd $QUICKSTART_HOME/bwclient~~
269		~~client=~~
270	381	return
271	382	fi
…	…
485	596	fi
486	597
	598	# ----------------------------------------------------------------------------
	599	# Here we go through looking for arguments.
	600	#
	601	# Look firther down for wher we are specifying projects to build. I've
	602	# not tried specifying more than one but I think it would work.
	603	#
	604	# There's a hidden default project "bedework" which you get if you don't specify
	605	# any of the below projects. That gets turned off by each of them with
	606	# pkgdefault=
	607	# Each also turns on it's own project build and any dependencies it has.
	608	# Further up in this file is where we build each project that has been turned
	609	# on. That processing is done in dependency order. Of course this whole process
	610	# fails if we ever build in a circular dependency - that's why it's important to
	611	# do a clean build fairly regularly. So as an example
	612	# -webdav)
	613	# webdav="yes"
	614	#
	615	# access="yes"
	616	# bwxml="yes"
	617	# rpiutil="yes"
	618	# pkgdefault=
	619	# Turns on the webdav build and also access, bwxml and rpiutil because it depends
	620	# on them.
	621	# ----------------------------------------------------------------------------
	622
487	623	while [ "$1" != "" ]
488	624	do
…	…
567	703	shift
568	704	;;
	705	-bwcaldav)
	706	bwcaldav="yes"
	707
	708	access="yes"
	709	bwannotations="yes"
	710	bwcalfacade="yes"
	711	bwicalendar="yes"
	712	bwinterfaces="yes"
	713	# bwmisc="yes"
	714	bwsysevents="yes"
	715	bwxml="yes"
	716	caldav="yes"
	717	# davutil="yes"
	718	rpiutil="yes"
	719	webdav="yes"
	720	pkgdefault=
	721	shift
	722	;;
	723	-bwcalcore)
	724	bwcalcore="yes"
	725
	726	access="yes"
	727	bwannotations="yes"
	728	bwcalfacade="yes"
	729	bwicalendar="yes"
	730	bwinterfaces="yes"
	731	bwmisc="yes"
	732	bwsysevents="yes"
	733	bwxml="yes"
	734	caldav="yes"
	735	davutil="yes"
	736	rpiutil="yes"
	737	webdav="yes"
	738	pkgdefault=
	739	shift
	740	;;
	741	-bwcalfacade)
	742	bwcalfacade="yes"
	743
	744	access="yes"
	745	bwannotations="yes"
	746	bwxml="yes"
	747	caldav="yes"
	748	davutil="yes"
	749	rpiutil="yes"
	750	webdav="yes"
	751	pkgdefault=
	752	shift
	753	;;
	754	-bwicalendar)
	755	bwicalendar="yes"
	756
	757	bwannotations="yes"
	758	bwcalfacade="yes"
	759	bwxml="yes"
	760
	761	pkgdefault=
	762	shift
	763	;;
	764	-bwinterfaces)
	765	bwinterfaces="yes"
	766
	767	access="yes"
	768	bwannotations="yes"
	769	bwxml="yes"
	770	caldav="yes"
	771	davutil="yes"
	772	rpiutil="yes"
	773	webdav="yes"
	774
	775	pkgdefault=
	776	shift
	777	;;
	778	-bwmisc)
	779	bwmisc="yes"
	780
	781	davutil="yes"
	782	bwannotations="yes"
	783	bwcalfacade="yes"
	784	bwicalendar="yes"
	785	pkgdefault=
	786	shift
	787	;;
	788	-bwsysevents)
	789	bwsysevents="yes"
	790
	791	bwinterfaces="yes"
	792	pkgdefault=
	793	shift
	794	;;
569	795	-bwtools)
570	796	bwtools="yes"
…	…
572	798	shift
573	799	;;
	800	-bwwebapps)
	801	bwwebapps="yes"
	802
	803	access="yes"
	804	bwannotations="yes"
	805	bwcalfacade="yes"
	806	bwicalendar="yes"
	807	bwinterfaces="yes"
	808	bwxml="yes"
	809	caldav="yes"
	810	davutil="yes"
	811	rpiutil="yes"
	812	webdav="yes"
	813	pkgdefault=
	814	shift
	815	;;
574	816	-bwxml)
575	817	bwxml="yes"
…	…
627	869
628	870	bwxml="yes"
	871	rpiutil="yes"
	872	pkgdefault=
	873	shift
	874	;;
	875	-deployutil)
	876	bwdeployutil="yes"
	877
	878	pkgdefault=
	879	shift
	880	;;
	881	-dumprestore)
	882	dumprestore="yes"
	883
	884	access="yes"
	885	bwannotations="yes"
	886	bwcalcore="yes"
	887	bwcalfacade="yes"
	888	bwicalendar="yes"
	889	bwinterfaces="yes"
	890	bwmisc="yes"
	891	bwsysevents="yes"
	892	indexer="yes"
	893	rpiutil="yes"
	894	pkgdefault=
	895	shift
	896	;;
	897	-indexer)
	898	indexer="yes"
	899
	900	access="yes"
	901	bwannotations="yes"
	902	bwcalcore="yes"
	903	bwcalfacade="yes"
	904	bwicalendar="yes"
	905	bwinterfaces="yes"
	906	bwmisc="yes"
	907	bwsysevents="yes"
	908	indexer="yes"
629	909	rpiutil="yes"
630	910	pkgdefault=
…	…
695	975
696	976	access="yes"
697		# bwannotations="yes"
	977	bwannotations="yes"
	978	bwcalcore="yes"
	979	bwcaldav="yes"
	980	bwcalfacade="yes"
	981	bwicalendar="yes"
	982	bwinterfaces="yes"
	983	bwmisc="yes"
	984	bwsysevents="yes"
	985	bwwebapps="yes"
698	986	bwxml="yes"
699	987	caldav="yes"
700	988	davutil="yes"
	989	dumprestore="yes"
	990	indexer="yes"
701	991	rpiutil="yes"
702	992	webdav="yes"

Changeset Navigation

Changeset 3407

Legend:

trunk/build/buildTools/deftasks.xml

trunk/build/quickstart/linux/bw

Download in other formats: