Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 3105

Timestamp:

01/02/11 01:27:22

Author:

douglm

Message:

Remove definition of property "base.name" from (almost) every build file. Was not used.
Stop defining, creating and copying to libapi. Wasn't in use.

Remove build directory from every project and use the build files in the main bedework project. improves consistency and maintainability. Also allowed some bugs to be fixed.

Allow setting of message level during build and set it at quiet. Allows error messages to be more obvious.

Create macro to handle the common property definitions. Reduces size and complexity of build files.

Add a build-jar macro. Removes need for build files for sub-modules. Partway through converting to use that.

Files:

trunk/build.xml (modified) (6 diffs)
trunk/build/build.xml (modified) (1 diff)
trunk/build/buildfilters.xml (modified) (2 diffs)
trunk/build/buildsh.xml (modified) (3 diffs)
trunk/build/buildwar.xml (modified) (8 diffs)
trunk/build/bw-deployutil-3.7.jar (added)
trunk/build/loadDeployConfig.xml (modified) (3 diffs)
trunk/build/platforms/jboss-bedework.xml (moved) (moved from trunk/build/platforms/jboss.xml) (1 diff)
trunk/build/platforms/jboss-card.xml (copied) (copied from trunk/build/platforms/jboss.xml) (1 diff)
trunk/build/platforms/jboss-exsynch.xml (added)
trunk/build/platforms/jboss-tzsvr.xml (added)
trunk/build/platforms/jbossService.xml (modified) (3 diffs)
trunk/build/platforms/jbossWar.xml (modified) (6 diffs)
trunk/build/quickstart/build.xml (modified) (7 diffs)
trunk/build/quickstart/linux/bw (modified) (5 diffs)
trunk/config/build.xml (modified) (1 diff)
trunk/config/bwbuild/.platform/ear.properties (modified) (1 diff)
trunk/deployment/build.xml (modified) (8 diffs)
trunk/deployment/publiccaldav/webapp/build.xml (modified) (1 diff)
trunk/deployment/termination/build.xml (modified) (2 diffs)
trunk/deployment/termination/webapp/build.xml (modified) (2 diffs)
trunk/deployment/webpublic/webapp/build.xml (modified) (1 diff)
trunk/deployutil/build.xml (modified) (1 diff)
trunk/docs/licences/activation-LICENSE.txt (added)
trunk/docs/licences/lib-licences (modified) (1 diff)
trunk/resources/exsynchwsdefs/iCalendar-params.xsd (modified) (3 diffs)

Legend:

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

trunk/build.xml

r2985	r3105
6	6	-->
7	7
8		<project name="bedework.build" default="~~usage~~" basedir=".">
	8	<project name="bedework.build" default="init" basedir=".">
9	9	<property environment="env"/>
10	10
…	…
62	62	location="${org.bedework.projects}/webdav" />
63	63
64		<import file="${org.bedework.project.bedework}/build/buildfilters.xml" />
65		<import file="${org.bedework.project.bedework}/build/loadDeployConfig.xml"/>
66		<import file="${org.bedework.project.bedework}/build/dirTools.xml"/>
	64	<property name="build.dir" location="${org.bedework.project.bedework}/build"/>
	65
	66	<property name="buildjar" location="${build.dir}/buildTools/buildjar.xml"/>
	67	<property name="buildsh" location="${build.dir}/buildsh.xml"/>
	68	<property name="buildwar" location="${build.dir}/buildwar.xml"/>
	69
	70	<import file="${build.dir}/buildTools/deftasks.xml"/>
	71
	72	<deftasks/>
	73
	74	<import file="${build.dir}/buildfilters.xml" />
	75	<import file="${build.dir}/loadDeployConfig.xml"/>
	76	<import file="${build.dir}/dirTools.xml"/>
67	77
68	78	<target name="README" depends="init"
…	…
101	111	<property name="resources.dir" location="${bw.project.home}/resources"/>
102	112	<property name="bin.home" location="${bw.project.home}/bin"/>
103
104		<property name="build.dir" location="${bw.project.home}/build"/>
105		<property name="buildjar" location="${build.dir}/buildTools/buildjar.xml"/>
106		<property name="buildsh" location="${build.dir}/buildsh.xml"/>
107		<property name="buildwar" location="${build.dir}/buildwar.xml"/>
108
	113
109	114	<property name="org.bedework.build.caldav" value="yes" />
110	115
…	…
176	181	================================================================= -->
177	182
178		<target name="build" depends="init.build,build.rpiutil,build.build,
	183	<target name="build" depends="init.build,build.deployutil,build.rpiutil,build.build,
179	184	build.access,build.davutil,
180	185	build.webdav,build.caldav,
…	…
183	188	build.bwtools,build.webapps,build.indexer,
184	189	build.dumprestore,
185		build.testsuite~~,build.deployutil~~"
	190	build.testsuite"
186	191	description="builds the project">
187	192	<mkdir dir="${dist.home}/tools" />
…	…
663	668	<property name="build.jar.file" location="${org.bedework.deployutil.jar}" />
664	669	</ant>
	670
	671	<copy todir="${build.dir}" file="${org.bedework.deployutil.jar}" />
665	672	</target>
666	673

trunk/build/build.xml

r2675	r3105
8	8
9	9	<project name="bedework.build" default="build">
10		~~<property name="base.name" value="build"/>~~
11	10	<property name="lib.dir" location="${org.bedework.default.lib}"/>
12	11

trunk/build/buildfilters.xml

r3001	r3105
12	12	value="${quickstart.dir}"/>
13	13
	14	<filter token="APPSERVER-DATA-DIR"
	15	value="${org.bedework.data.dir}"/>
	16
14	17	<filter token="DATA_DIR"
15	18	value="${org.bedework.data.dir}"/>
…	…
53	56	<filter token="LIFERAY-COMPANY-ID"
54	57	value="${org.bedework.global.liferay.company-id}"/>
	58
	59	<filter token="JBOSS-CARDDB-DATASOURCE"
	60	value="${org.bedework.global.jboss.carddb.datasource.jndiname}"/>
55	61
56	62	<filter token="JBOSS-DB-DATASOURCE"

trunk/build/buildsh.xml

r2973	r3105
29	29	location="${app.dest.home}/classes" />
30	30	<property name="app.dest.properties"
31		location="${app.dest.classes}/properties/~~calendar~~" />
	31	location="${app.dest.classes}/properties/${org.bedework.deployment.name}" />
32	32	<property name="app.dest.data"
33	33	location="${app.dest.home}/data" />
…	…
51	51	<antcall target="addLibs" inheritRefs="true" />
52	52
53		<copy todir="${app.dest.classes}">
54		<fileset dir="${org.bedework.project.calendarapi}/calCore/resources/properties" />
55		<filterset refid="property.filters" />
56		</copy>
57
58		<copy todir="${app.dest.classes}">
59		<fileset dir="${org.bedework.project.calendarapi}/calCore/resources/hbms" />
60		<filterset refid="property.filters" />
61		</copy>
	53	<if>
	54	<isset property="org.bedework.sou.hibernate.properties" />
	55	<then>
	56	<if>
	57	<istrue value="${org.bedework.build.debug}" />
	58	<then>
	59	<echo message="************* Copy hib properties from ${org.bedework.sou.hibernate.properties}" />
	60	</then>
	61	</if>
	62	<copy todir="${app.dest.classes}">
	63	<fileset dir="${org.bedework.sou.hibernate.properties}/properties" />
	64	<filterset refid="property.filters" />
	65	</copy>
	66
	67	<copy todir="${app.dest.classes}">
	68	<fileset dir="${org.bedework.sou.hibernate.properties}/hbms" />
	69	<filterset refid="property.filters" />
	70	</copy>
	71	</then>
	72	</if>
62	73
63	74	<copy tofile="${app.dest.classes}/sysevents.properties"
…	…
81	92
82	93	<copy tofile="${app.dest.properties}/options.xml"
83		file="${org.bedework.~~config.options~~}" >
	94	file="${org.bedework.options.file}" >
84	95	<filterset>
85	96	<filter token="RPI-DEBUG" value="${app.debug.val}"/>

trunk/build/buildwar.xml

r2876	r3105
38	38
39	39	<project name="bedework.buildwar" default="build" >
	40	<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
	41
40	42	<import file="${build.dir}/buildfilters.xml" />
41	43
…	…
63	65	</else>
64	66	</if>
65		~~<property name="app.dest.properties.old"~~
66		~~location="${app.dest.classes}/properties/calendar" />~~
67	67	<property name="app.dest.properties"
68		location="${app.dest.classes}/properties" />
	68	location="${app.dest.classes}/properties/${org.bedework.deployment.name}" />
69	69	</target>
70	70
…	…
108	108
109	109	<target name="build" depends="init">
110		<echo message="**************************************************" />
111		<echo message=" * Building war ${propval.app.war.name}"/>
112		<echo message="**************************************************" />
	110	<infoMsg message="* =========== Building war ${propval.app.war.name}" />
113	111
114	112	<delete dir="${app.dest.war}" />
115	113
116		<!-- Add modifed login pages -->
117		<copy todir="${app.dest.docs}/login" failonerror="false" >
118		<fileset dir="${org.bedework.common.resources}/login" />
119		<filterset>
120		<filter token="DISPLAY-NAME" value="${propval.app.display.name}"/>
121		</filterset>
122		</copy>
	114	<if>
	115	<available file="${app.sou.dir}/war/docs" type="dir" />
	116	<then>
	117	<!-- Add modifed login pages -->
	118	<copy todir="${app.dest.docs}/login" failonerror="false" >
	119	<fileset dir="${org.bedework.common.resources}/login" />
	120	<filterset>
	121	<filter token="DISPLAY-NAME" value="${propval.app.display.name}"/>
	122	</filterset>
	123	</copy>
	124	</then>
	125	</if>
123	126
124	127	<!-- ===============================================================
…	…
164	167
165	168	<copy tofile="${app.dest.properties}/options.xml"
166		file="${org.bedework.~~config.options~~}" >
	169	file="${org.bedework.options.file}" >
167	170	<filterset>
168	171	<filter token="RPI-DEBUG" value="${app.debug.val}"/>
…	…
170	173	<filterset refid="property.filters" />
171	174	</copy>
172
173		<!-- Temp do it again -->
174		<mkdir dir="${app.dest.properties.old}" />
175
176		<copy tofile="${app.dest.properties.old}/options.xml"
177		file="${org.bedework.config.options}" >
178		<filterset>
179		<filter token="RPI-DEBUG" value="${app.debug.val}"/>
180		</filterset>
181		<filterset refid="property.filters" />
182		</copy>
183
184		<!--
185		<if>
186		<available file="${app.sou.dir}/war/WEB-INF/classes" type="dir" />
187		<then>
188		<copy todir="${app.dest.classes}">
189		<fileset dir="${app.sou.dir}/war/WEB-INF/classes"
190		includes="*"/>
191		<filterset refid="property.filters" />
192		</copy>
193		</then>
194		</if>
195		-->
196
197		<!-- Make our own servlet.properties file for struts applications
198		<copy tofile="${app.dest.classes}/servlet.properties" file="${app.sou.properties}">
199		<filterset refid="property.filters" />
200		</copy>
201		-->
202
	175
203	176	<copy tofile="${app.dest.classes}/sysevents.properties"
204	177	file="${org.bedework.config.sysevents.properties}" />
205	178
206		<!-- ===============================================================
207		Add hibernate jars and property files from calendar api.
208		=============================================================== -->
209
210		<copy todir="${app.dest.classes}">
211		<fileset dir="${org.bedework.project.calendarapi}/calCore/resources/properties" />
212		<filterset refid="property.filters" />
213		</copy>
214
215		<copy todir="${app.dest.classes}">
216		<fileset dir="${org.bedework.project.calendarapi}/calCore/resources/hbms" />
217		<filterset refid="property.filters" />
218		</copy>
	179	<if>
	180	<isset property="org.bedework.sou.classpath.properties" />
	181	<then>
	182	<copy todir="${app.dest.classes}">
	183	<fileset dir="${org.bedework.sou.classpath.properties}" />
	184	<filterset refid="property.filters" />
	185	</copy>
	186	</then>
	187	</if>
	188
	189	<if>
	190	<isset property="org.bedework.sou.hibernate.properties" />
	191	<then>
	192	<!-- ===========================================================
	193	Add hibernate config.
	194	=========================================================== -->
	195
	196	<debugMsg message="************* Copy hib properties from ${org.bedework.sou.hibernate.properties}" />
	197
	198	<copy todir="${app.dest.classes}">
	199	<fileset dir="${org.bedework.sou.hibernate.properties}/properties" />
	200	<filterset refid="property.filters" />
	201	</copy>
	202
	203	<copy todir="${app.dest.classes}">
	204	<fileset dir="${org.bedework.sou.hibernate.properties}/hbms" />
	205	<filterset refid="property.filters" />
	206	</copy>
	207	</then>
	208	</if>
219	209
220	210	<!-- Make a temp copy of the web.xml file -->
…	…
249	239	<!-- build the war file or directory -->
250	240	<mkdir dir="${dist.home}" />
251
252		<!-- may be there as a file or a directory -->
	241
	242	<!-- may be there as a file or a directory -->
253	243	<delete file="${app.war.file}" />
254	244	<delete dir="${app.war.file}" />
255	245
256	246	<if>
257		<or>
258		<not>
	247	<or>
	248	<not>
259	249	<isset property="org.bedework.global.wars.zipped" />
260		</not>
261		<istrue value="${org.bedework.global.wars.zipped}"/>
	250	</not>
	251	<istrue value="${org.bedework.global.wars.zipped}"/>
262	252	</or>
263	253	<then>
264		<!-- Build a zipped war file -->
	254	<!-- Build a zipped war file -->
265	255	<war warfile="${app.war.file}"
266	256	webxml="${app.dest.web.xml}"
…	…
284	274
285	275	<target name="struts-stuff" if="org.bedework.strutsapp">
286		<!-- Make our own servlet.properties file for struts applications -->
	276	<!-- Make our own servlet.properties file for struts applications -->
287	277	<echo file="${app.dest.classes}/servlet.properties" ><![CDATA[#
288	278	# ========================================================================
…	…
346	336	value="${propval.app.default.contenttype}" />
347	337	</replace>
348
	338
349	339	<!-- Copy a dummy startup file into the war. -->
350	340	<copy todir="${app.dest.war}">

trunk/build/loadDeployConfig.xml

r2053	r3105
8	8	<project name="loadDeployConfig" basedir="." default="">
9	9	<macrodef name="loadDeployConfig">
	10	<!--<attribute name="extra.options" default="${org.bedework.carddav.options}"/> -->
10	11	<sequential>
11	12	<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
…	…
13	14	<property environment="env"/>
14	15
15		~~<echo message="Load user properties from ${org.bedework.user.build.properties}" />~~
16
17	16	<!-- Load user property definition overrides -->
18	17	<property file="${org.bedework.user.build.properties}" />
19	18
20		<!-- These should already be defined in the above file
21		<property name="org.bedework.config.properties"
22		location="${org.bedework.config.base}/configs/democal.properties" />
23		<property name="org.bedework.config.options"
24		location="${org.bedework.config.base}/configs/democal.options.xml" />
25		-->
26
27		<echo message="==========================================================" />
28		<echo message="Use config properties ${org.bedework.config.properties}" />
29		<property file="${org.bedework.config.properties}" />
	19	<infoMsg message="==========================================================" />
	20	<infoMsg message="Loading user properties from ${org.bedework.user.build.properties}" />
	21	<infoMsg message="Use config properties ${org.bedework.config.properties}" />
	22	<infoMsg message="Runtime options from ${org.bedework.config.options}" />
	23	<infoMsg message="==========================================================" />
	24
	25	<property file="${org.bedework.config.properties}" />
30	26
31	27	<!-- Load the run time options and define some properties based on some
32	28	of the values -->
33	29
	30	<!-- Load the general bedework options -->
34	31	<xmlproperty file="${org.bedework.config.options}"/>
35	32
36		<!-- Load the ~~CardDAV options -->~~
37		<xmlproperty file="~~${org.bedework.carddav.options}"/~~>
	33	<!-- Load the extra options
	34	<xmlproperty file="@{extra.options}"/>-->
38	35
39	36	<if>
…	…
49	46	value="${org.bedework.configurations.home}/.portal/common-resources" />
50	47
51		<echo message="******************* load from ${org.bedework.config.portal.home}/portal.properties" />
	48	<debugMsg message="******************* load from ${org.bedework.config.portal.home}/portal.properties" />
	49
52	50	<property file="${org.bedework.config.portal.home}/portal.properties" />
53	51	</then>
54	52	<else>
55		<echo message="******************* load from ${org.bedework.configurations.home}/.standalone/standalone.properties" />
	53	<debugMsg message="******************* load from ${org.bedework.configurations.home}/.standalone/standalone.properties" />
	54
56	55	<property file="${org.bedework.configurations.home}/.platform/standalone.properties" />
57	56	</else>

trunk/build/platforms/jboss-bedework.xml

r3092	r3105
9	9	<project name="bedework.platformTermination" default="doPlatform" >
10	10	<target name="doPlatform" >
	11	<!-- copy startup website that sends you to the applications -->
	12	<property name="startup.website.dir"
	13	location="${org.bedework.appserver.dir}/${org.bedework.server.resource.root.dir}/bedework" />
	14	<delete dir="${startup.website.dir}"/>
	15	<mkdir dir="${startup.website.dir}"/>
	16	<copy todir="${startup.website.dir}">
	17	<fileset dir="${app.root.dir}/resources/bedework"/>
	18	</copy>
	19
	20	<!-- copy any jars required in the server lib (jdbc etc) -->
	21	<if>
	22	<available file="${org.bedework.global.ext.lib}/server" type="dir" />
	23	<then>
	24	<copy todir="${appserver.lib.dir}" flatten="yes" >
	25	<fileset dir="${org.bedework.global.ext.lib}/server">
	26	<include name="*.jar"/>
	27	</fileset>
	28	</copy>
	29	</then>
	30	</if>
	31
	32	<if>
	33	<isset property="org.bedework.global.extra.jars" />
	34	<then>
	35	<foreach list="${org.bedework.global.extra.jars}"
	36	target="copyToServer"
	37	param="org.bedework.extra.jar"
	38	inheritall="true"
	39	trim="true" />
	40	</then>
	41	</if>
	42
	43	<if>
	44	<available file="${java.tools.jar}" />
	45	<then>
	46	<copy todir="${appserver.lib.dir}" file="${java.tools.jar}"/>
	47	</then>
	48	</if>
	49
11	50	<if>
12	51	<isset property="org.bedework.appserver.deploy.dir" />

trunk/build/platforms/jboss-card.xml

r3092	r3105
9	9	<project name="bedework.platformTermination" default="doPlatform" >
10	10	<target name="doPlatform" >
	11	<!-- If requested copy in the db configuration. -->
	12
11	13	<if>
12		<is~~set property="org.bedework.appserver.deploy.dir~~" />
	14	<istrue value="${org.bedework.global.copy.bedeworkcardds.config}" />
13	15	<then>
14		<!-- If requested copy in the activemq configuration. -->
15
16		<if>
17		<istrue value="${org.bedework.global.copy.activemq.config}" />
18		<then>
19		<copy file="${org.bedework.config.home}/activemq-ra.xml"
20		tofile="${org.bedework.global.activemq.dir}/META-INF/ra.xml"
21		overwrite="yes" />
22		<copy file="${org.bedework.config.home}/activemq-broker-config.xml"
23		tofile="${org.bedework.global.activemq.dir}/broker-config.xml"
24		overwrite="yes" />
25		<copy file="${org.bedework.config.home}/activemq-jms-ds.xml"
26		tofile="${org.bedework.appserver.deploy.dir}/activemq-jms-ds.xml"
27		overwrite="yes" />
28		</then>
29		</if>
30		<!-- If requested copy in the db configuration. -->
31
32		<if>
33		<istrue value="${org.bedework.global.copy.bedeworkds.config}" />
34		<then>
35		<copy file="${org.bedework.config.home}/bedework-ds.xml"
36		tofile="${org.bedework.appserver.deploy.dir}/bedework-ds.xml"
37		overwrite="yes" />
38		</then>
39		</if>
	16	<copy file="${org.bedework.config.home}/bedework-card-ds.xml"
	17	tofile="${org.bedework.appserver.deploy.dir}/bedework-card-ds.xml"
	18	overwrite="yes" />
40	19	</then>
41	20	</if>

trunk/build/platforms/jbossService.xml

r3096	r3105
21	21	</then>
22	22	<else>
	23	<mkdir dir="${app.dest.classes}"/>
	24
23	25	<echo file="${app.dest.classes}/hibernate.properties">
24	26	hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N'
25	27	hibernate.dialect=${org.bedework.global.hibernate.dialect}
26	28
27		hibernate.connection.datasource=java:${org.bedework.~~global.jboss.db~~.datasource.jndiname}
	29	hibernate.connection.datasource=java:${org.bedework.jboss.datasource.jndiname}
28	30
29	31	hibernate.bytecode.use_reflection_optimizer=false
…	…
52	54	<else>
53	55	<!-- Library in sar file -->
	56	<property name="app.dest.lib"
	57	location="${app.dest.webinf}/lib" />
	58
54	59	<copy todir="${app.dest.lib}" >
55	60	<fileset dir="${org.bedework.temp.extrajars.dir}" />
…	…
61	66	</not>
62	67	<then>
63		~~<property name="app.dest.lib"~~
64		~~location="${app.dest.webinf}/lib" />~~
65	68	<antcall target="copyLibs" inheritRefs="true" />
66	69	</then>

trunk/build/platforms/jbossWar.xml

r2955	r3105
50	50	<property name="app.dest.lib"
51	51	location="${app.dest.webinf}/lib" />
52		<antcall target="copyLibs" inheritRefs="true" />
	52	<if>
	53	<not>
	54	<isset property="propval.app.no.defaultlibs" />
	55	</not>
	56	<then>
	57	<antcall target="copyLibs" inheritRefs="true" />
	58	</then>
	59	</if>
53	60	</then>
54	61	<else>
…	…
71	78	</not>
72	79	<then>
73		<echo message="***************************************************************" />
74		<echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
75		<echo message="***************************************************************" />
	80	<infoMsg message="* =========== Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
76	81
77	82	<!-- copy the war file. -->
…	…
90	95
91	96	<target name="deployEar">
	97	<if>
	98	<equals arg1="${org.bedework.global.ear.zipped}"
	99	arg2="yes" />
	100	<then>
	101	<property name="org.bedework.ear.dir"
	102	location="${org.bedework.temp.dir}/${org.bedework.ear.name}" />
	103	<property name="org.bedework.ear.file"
	104	location="${org.bedework.temp.dir}/${org.bedework.ear.name}.ear" />
	105	</then>
	106	<else>
	107	<property name="org.bedework.ear.dir"
	108	location="${org.bedework.temp.dir}/${org.bedework.ear.name}.ear" />
	109	</else>
	110	</if>
	111
	112	<delete dir="${org.bedework.ear.dir}" />
	113	<mkdir dir="${org.bedework.ear.dir}" />
	114
	115	<property name="org.bedework.ear.properties.jar"
	116	value="${org.bedework.ear.dir}/bw-ear-properties.jar"/>
	117
92	118	<!-- Common library in ear file -->
93	119	<property name="app.dest.lib"
94	120	location="${org.bedework.ear.dir}" />
95		<antcall target="copyLibs" inheritRefs="true" />
96
97		<!-- And the extra jars we preserved -->
	121	<if>
	122	<not>
	123	<isset property="propval.app.no.defaultlibs" />
	124	</not>
	125	<then>
	126	<antcall target="copyLibs" inheritRefs="true" />
	127	</then>
	128	</if>
	129
	130	<!-- And the extra jars we preserved -->
98	131	<copy todir="${app.dest.lib}" >
99	132	<fileset dir="${org.bedework.temp.ear.extrajars.dir}" />
100	133	</copy>
101	134
102		<echo message="***************************************************************" />
103		<echo message="Building ear file for jboss deployment" />
104		<echo message="***************************************************************" />
	135	<infoMsg message="* =========== Building ear file ${org.bedework.ear.dir} for jboss deployment" />
105	136
106	137	<jar jarfile="${org.bedework.ear.properties.jar}">
…	…
108	139	</jar>
109	140
110		<path id="app.xml.cp">
111		<pathelement location="${org.bedework.deployutil.jar}"/>
112		</path>
113
114		<taskdef name="applicationXml"
115		classname="org.bedework.deployment.ApplicationXmlTask">
116		<classpath refid="app.xml.cp"/>
117		</taskdef>
118
119		<echo message="outFile=${org.bedework.ear.dir}/META-INF/application.xml
120		warDir=${org.bedework.temp.dir}/wars
121		contexts=${org.bedework.global.context.roots}" />
122
	141	<debugMsg message="outFile=${org.bedework.ear.dir}/META-INF/application.xml
	142	warDir=${org.bedework.temp.dir}/wars
	143	contexts=${org.bedework.global.context.roots}" />
	144
	145	<mkdir dir="${org.bedework.ear.dir}/META-INF" />
	146
123	147	<applicationXml displayName="Bedework calendar suite"
124	148	outFile="${org.bedework.ear.dir}/META-INF/application.xml"
…	…
129	153	</fileset>
130	154	</applicationXml>
131
	155
132	156	<echo file="${org.bedework.ear.dir}/META-INF/jboss-app.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
133	157	<jboss-app>
…	…
138	162	</jboss-app>
139	163	]]></echo>
140
	164
141	165	<replace file="${org.bedework.ear.dir}/META-INF/jboss-app.xml"
142		token="@EAR_NAME@"
143		value="${app.ear.file.name}"/>
144
	166	token="@EAR_NAME@"
	167	value="${app.ear.file.name}"/>
	168
	169	<if>
	170	<and>
	171	<isset property="ear.meta.dir" />
	172	<available file="${ear.meta.dir}" type="dir" />
	173	</and>
	174	<then>
	175	<copy todir="${org.bedework.ear.dir}/META-INF">
	176	<fileset dir="${ear.meta.dir}" />
	177	<filterset refid="property.filters" />
	178	</copy>
	179	</then>
	180	</if>
	181
145	182	<manifest file="${org.bedework.ear.dir}/META-INF/MANIFEST.MF" />
146	183

trunk/build/quickstart/build.xml

r3098	r3105
128	128	<ant antfile="${bedework.build.file}" inheritrefs="true"
129	129	target="build" />
130		<tstamp prefix="endbuild" />
131		<echo level="info" message="=================> Build finished at ${endbuild.TODAY}" />
	130
	131	<tstamp>
	132	<format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
	133	</tstamp>
	134
	135	<echo message="* ============== finished at ${deploydebug.time}" />
132	136	</target>
133	137
…	…
136	140	<ant antfile="${bedework.build.file}" inheritrefs="true"
137	141	target="clean.build" />
	142
	143	<tstamp>
	144	<format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
	145	</tstamp>
	146
	147	<echo message="* ============== finished at ${deploydebug.time}" />
138	148	</target>
139	149
…	…
159	169	<ant antfile="${bedework.build.file}" inheritrefs="true"
160	170	target="deploy" />
	171
	172	<tstamp>
	173	<format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
	174	</tstamp>
	175
	176	<echo message="* ============== finished at ${deploydebug.time}" />
161	177	</target>
162	178
…	…
165	181	<ant antfile="${bedework.build.file}" inheritrefs="true"
166	182	target="deploy.debug" />
167		<tstamp>
168		<format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
169		</tstamp>
170
171		<echo level="info" message="=================> deploy.debug finished at ${deploydebug.time}" />
	183
	184	<tstamp>
	185	<format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
	186	</tstamp>
	187
	188	<echo message="* ============== finished at ${deploydebug.time}" />
172	189	</target>
173	190
…	…
186	203	<ant antfile="${bedework.build.file}" inheritrefs="true"
187	204	target="quickstart-clean" />
	205
	206	<tstamp>
	207	<format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
	208	</tstamp>
	209
	210	<echo message="* ============== finished at ${deploydebug.time}" />
188	211	</target>
189	212
…	…
192	215	<ant antfile="${bedework.build.file}" inheritrefs="true"
193	216	target="clean.deploy" />
	217
	218	<tstamp>
	219	<format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
	220	</tstamp>
	221
	222	<echo message="* ============== finished at ${deploydebug.time}" />
194	223	</target>
195	224
…	…
198	227	<ant antfile="${bedework.build.file}" inheritrefs="true"
199	228	target="clean.deploy.debug" />
	229
	230	<tstamp>
	231	<format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
	232	</tstamp>
	233
	234	<echo message="* ============== finished at ${deploydebug.time}" />
200	235	</target>
201	236

trunk/build/quickstart/linux/bw

r3100	r3105
17	17	ant_logger=
18	18
	19	ant_loglevel="-quiet"
	20	bw_loglevel=""
	21
19	22	echo ""
20	23	echo " Bedework Calendar System"
…	…
25	28
26	29	usage() {
27		echo " $PRG [CONFIG-SOURCE] [CONFIG] [PROJECT] [ -offline ] [ target ] "
	30	echo " $PRG [CONFIG-SOURCE] [CONFIG] [PROJECT] [ -offline ] [LOG_LEVEL] [ target ] "
28	31	echo " $PRG ACTION"
29	32	echo ""
…	…
40	43	echo ""
41	44	echo " -offline Build without attempting to retrieve library jars"
	45	echo ""
	46	echo " LOG_LEVEL sets the level of logging and can be"
	47	echo " -log-silent Nearly silent"
	48	echo " -log-quiet The default"
	49	echo " -log-inform A little more noisy"
	50	echo " -log-verbose Noisier"
	51	echo " -ant-debug Vast amounts of ant output"
	52	echo " -build-debug Some bedework build debug output"
	53	echo ""
42	54	echo " target Ant target to execute"
43	55	echo ""
…	…
304	316	shift
305	317	;;
306		# Projects
	318	# ----------------------- Log level
	319	-log-silent)
	320	ant_loglevel="-quiet"
	321	bw_loglevel="-Dorg.bedework.build.silent=true"
	322	shift
	323	;;
	324	-log-quiet)
	325	ant_loglevel="-quiet"
	326	bw_loglevel=""
	327	shift
	328	;;
	329	-log-inform)
	330	ant_loglevel=""
	331	bw_loglevel="-Dorg.bedework.build.inform=true"
	332	shift
	333	;;
	334	-log-verbose)
	335	ant_loglevel="-verbose"
	336	bw_loglevel="-Dorg.bedework.build.inform=true -Dorg.bedework.build.noisy=true"
	337	shift
	338	;;
	339	-ant-debug)
	340	ant_loglevel="-debug"
	341	shift
	342	;;
	343	-build-debug)
	344	bw_loglevel="-Dorg.bedework.build.inform=true -Dorg.bedework.build.noisy=true -Dorg.bedework.build.debug=true "
	345	shift
	346	;;
	347	# ------------------------Projects
307	348	-carddav)
308	349	carddav="yes"
…	…
418	459	fi
419	460
420		$JAVA_HOME/bin/java -classpath $CLASSPATH $ant_xmllogfile $offline -Dant.home=$ANT_HOME org.apache.tools.ant.launch.Launcher $BWCONFIG $ant_listener $ant_logger $*
	461	$JAVA_HOME/bin/java -classpath $CLASSPATH $ant_xmllogfile $offline -Dant.home=$ANT_HOME org.apache.tools.ant.launch.Launcher $BWCONFIG $ant_listener $ant_logger $ant_loglevel $bw_loglevel $*

trunk/config/build.xml

r1953	r3105
8	8
9	9	<project name="cal.config" default="init" >
10		~~<property name="base.name" value="config"/>~~
11
12		~~<!--~~
13		~~<import file="${org.bedework.config.base}/build.pubcaldav.xml"/>~~
14		~~-->~~
15
16	10	<target name="init">
17	11	<dirname property="this.dir" file="${ant.file}"/>

trunk/config/bwbuild/.platform/ear.properties

r2872	r3105
11	11	org.bedework.ear.templib=${org.bedework.temp.dir}/earlib
12	12
13		org.bedework.ear.dir=${org.bedework.temp.dir}/${org.bedework.global.ear.name}
	13	#org.bedework.ear.dir=${org.bedework.temp.dir}/${org.bedework.global.ear.name}
14	14
15	15	org.bedework.ear.properties.dir=${org.bedework.temp.dir}/ear-properties
16	16
17		org.bedework.ear.properties.jar=${org.bedework.ear.dir}/bw-ear-properties.jar
	17	#Sorg.bedework.ear.properties.jar=${org.bedework.ear.dir}/bw-ear-properties.jar
18	18

trunk/deployment/build.xml

r2829	r3105
56	56
57	57	<project name="deploy.bedework" default="init">
58		~~<property name="base.name" value="deployment"/>~~
59
60	58	<property name="org.bedework.temp.wars.home"
61	59	location="${org.bedework.temp.dir}/wars" />
…	…
89	87	<property name="app.debug.val" value="0" />
90	88
91		<!-- set this for the war builds -->
	89	<!-- set these for the war builds -->
92	90	<dirname property="app.root.dir" file="${ant.file}"/>
	91
	92	<property name="org.bedework.deployment.name"
	93	value="bedework" />
	94
	95	<property name="org.bedework.sou.hibernate.properties"
	96	location="${org.bedework.project.calendarapi}/calCore/resources" />
	97
	98	<property name="org.bedework.jboss.datasource.jndiname"
	99	value="${org.bedework.global.jboss.db.datasource.jndiname}" />
	100
	101	<property name="org.bedework.options.file"
	102	value="${org.bedework.config.options}" />
93	103
94	104	<!-- Common resources directory -->
…	…
106	116	value="${org.bedework.global.ear.name}.ear" />
107	117
108		<if>
109		<equals arg1="${org.bedework.global.ear.zipped}"
110		arg2="yes" />
111		<then>
112		<property name="org.bedework.ear.dir"
113		location="${dist.home}/${org.bedework.global.ear.name}" />
114		<property name="org.bedework.ear.file"
115		location="${dist.home}/${org.bedework.global.ear.name}.ear" />
116		</then>
117		<else>
118		<property name="org.bedework.ear.dir"
119		location="${dist.home}/${org.bedework.global.ear.name}.ear" />
120		</else>
121		</if>
	118	<property name="org.bedework.ear.name"
	119	value="${org.bedework.global.ear.name}" />
122	120
123	121	<property name="org.bedework.ear.properties.dir"
124	122	location="${org.bedework.temp.dir}/ear-properties" />
125
126		~~<property name="org.bedework.ear.properties.jar"~~
127		~~location="${org.bedework.ear.dir}/bw-ear-properties.jar"/>~~
128
129		~~<delete dir="${org.bedework.ear.dir}" />~~
130		~~<mkdir dir="${org.bedework.ear.dir}" />~~
131	123
132	124	<delete dir="${org.bedework.ear.templib}" />
…	…
153	145	</target>
154	146
	147	<!--
155	148	<target name="deftasks" depends="init">
156	149	<path id="app.xml.cp">
…	…
173	166	</taskdef>
174	167	</target>
175
176		<target name="build.configured" depends="deftasks" >
	168	-->
	169
	170	<target name="build.configured" depends="init" >
177	171	<!-- Clean up before we start -->
178	172	<delete dir="${org.bedework.temp.wars.home}" />
…	…
196	190	================================================================= -->
197	191
198		<target name="deploy" depends="~~deftasks~~" >
	192	<target name="deploy" depends="init" >
199	193	<!-- Clean up before we start -->
200	194	<delete dir="${org.bedework.temp.wars.home}" />
…	…
271	265	<property name="org.bedework.deploy.type.dir"
272	266	location="${app.root.dir}/${org.bedework.deploy.name}/${propval.app.type}" />
273		<echo message="*********************************** deploy directory is ${org.bedework.deploy.type.dir}" />
	267	<if>
	268	<istrue value="${org.bedework.build.debug}" />
	269	<then>
	270	<echo message="*************** deployment build directory is ${org.bedework.deploy.type.dir}" />
	271	</then>
	272	</if>
274	273
275	274	<if>
…	…
313	312	<property name="org.bedework.deploy.type.dir"
314	313	location="${app.root.dir}/${propval.app.type}" />
315		<echo message="*********************************** deploy directory is ${org.bedework.deploy.type.dir}" />
	314	<if>
	315	<istrue value="${org.bedework.build.debug}" />
	316	<then>
	317	<echo message="*********************** deployment build directory is ${org.bedework.deploy.type.dir}" />
	318	</then>
	319	</if>
316	320
317	321	<if>

trunk/deployment/publiccaldav/webapp/build.xml

r2698	r3105
33	33	The "deploy" target first builds a configured component then copies
34	34	all required files to the appropriate servlet container directories.
35
36		~~Currently this only works for the quickstart distribution.~~
37		~~For example, it does not handle deploying into jboss and copying~~
38		~~resource files (images, stylesheets) to external locations.~~
39	35	================================================================= -->
40	36

trunk/deployment/termination/build.xml

r2829	r3105
6	6
7	7	<project name="bwdeploy.termination" default="deploy" >
8		<import file="${org.bedework.deployment.base}/deployprops.xml" />
9
10		<import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}.xml" />
	8	<import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}-${org.bedework.deployment.name}.xml" />
11	9
12	10	<dirname property="this.dir" file="${ant.file}"/>
	11
	12	<!-- ensure has value -->
	13	<property name="propval.app.cal.suite" value="" />
13	14
14	15	<target name="init">
…	…
16	17
17	18	<target name="deploy" depends="init,build.configured" >
18		~~<!-- copy startup website that sends you to the applications -->~~
19		~~<property name="startup.website.dir"~~
20		~~location="${org.bedework.appserver.dir}/${org.bedework.server.resource.root.dir}/bedework" />~~
21		~~<delete dir="${startup.website.dir}"/>~~
22		~~<mkdir dir="${startup.website.dir}"/>~~
23		~~<copy todir="${startup.website.dir}">~~
24		~~<fileset dir="${app.root.dir}/resources/bedework"/>~~
25		~~</copy>~~
26
27		~~<!-- copy any jars required in the server lib (jdbc etc) -->~~
28		~~<if>~~
29		~~<available file="${org.bedework.global.ext.lib}/server" type="dir" />~~
30		~~<then>~~
31		~~<copy todir="${appserver.lib.dir}" flatten="yes" >~~
32		~~<fileset dir="${org.bedework.global.ext.lib}/server">~~
33		~~<include name="*.jar"/>~~
34		~~</fileset>~~
35		~~</copy>~~
36		~~</then>~~
37		~~</if>~~
38
39		~~<if>~~
40		~~<isset property="org.bedework.global.extra.jars" />~~
41		~~<then>~~
42		~~<foreach list="${org.bedework.global.extra.jars}"~~
43		~~target="copyToServer"~~
44		~~param="org.bedework.extra.jar"~~
45		~~inheritall="true"~~
46		~~trim="true" />~~
47		~~</then>~~
48		~~</if>~~
49
50		~~<if>~~
51		~~<available file="${java.tools.jar}" />~~
52		~~<then>~~
53		~~<copy todir="${appserver.lib.dir}" file="${java.tools.jar}"/>~~
54		~~</then>~~
55		~~</if>~~
56
57	19	<!-- Platform specific -->
58	20	<antcall target="doPlatform" inheritRefs="true" />

trunk/deployment/termination/webapp/build.xml

r2698	r3105
2	2
3	3	<!-- ===================================================================
4		~~Standalone apps terminations tasks~~.
	4	terminations task.
5	5	=================================================================== -->
6	6
7	7	<project name="bwdeploy.termination" default="deploy" >
8		~~<import file="${org.bedework.deployment.base}/deployprops.xml" />~~
9
10	8	<import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" />
11	9
	10	<import file="${build.dir}/buildfilters.xml" />
	11
12	12	<dirname property="this.dir" file="${ant.file}"/>
	13
	14	<!-- ensure has value -->
	15	<property name="propval.app.cal.suite" value="" />
13	16
14	17	<target name="init">
…	…
16	19
17	20	<target name="deploy" depends="init,build.configured" >
18		<!-- Deploy common resources -->
19		<ant antfile="${org.bedework.common.resources}/build.xml"
20		inheritrefs="true" target="deploy" />
21
	21	<if>
	22	<isset property="org.bedework.common.resources" />
	23	<then>
	24	<!-- Deploy common resources -->
	25	<ant antfile="${org.bedework.common.resources}/build.xml"
	26	inheritrefs="true" target="deploy" />
	27	</then>
	28	</if>
	29
22	30	<if>
23	31	<isset property="org.bedework.global.build.ear" />

trunk/deployment/webpublic/webapp/build.xml

r2698	r3105
37	37	<property name="app.resources.dir"
38	38	location="${this.dir}/resources" />
39		~~<echo message="app.resources.dir=${app.resources.dir}" />~~
40	39	</target>
41	40

trunk/deployutil/build.xml

r2625	r3105
8	8
9	9	<project name="bedework.deployutil" default="build">
10		~~<property name="base.name" value="deployutil"/>~~
11	10	<property name="lib.dir" location="${org.bedework.default.lib}"/>
12	11

trunk/docs/licences/lib-licences

r3041	r3105
2	2
3	3	gson Google-Apache-2.0
	4
	5	activation-1.4.jar - ? Sun
	6	activemq-core-5.3.0.jar Apache License, Version 2.0
	7	ant-1.7.0.jar Apache License, Version 2.0
	8	antlr-2.7.6.jar BSD License
	9	asm-3.2.jar Apache License, Version 2.0
	10	asm-attrs.jar Apache License, Version 2.0
	11	backport-util-concurrent.jar
	12	cglib-2.1.3.jar Apache License, Version 2.0
	13	commons-beanutils-1.7.0.jar Apache License, Version 2.0
	14	commons-codec-1.3.jar Apache License, Version 2.0
	15	commons-collections-3.1.jar Apache License, Version 2.0
	16	commons-digester-1.7.jar Apache License, Version 2.0
	17	commons-fileupload.jar
	18	commons-httpclient-3.0.jar
	19	commons-lang-2.1.jar
	20	commons-logging.jar
	21	commons-ssl.jar
	22	commons-validator-1.3.0.jar
	23	derby-10.5.3.0.jar
	24	derbynet-10.5.3.0.jar
	25	dom4j-1.6.1.jar BSD License
	26	dsn-1.4.jar
	27	ehcache-1.2.3.jar
	28	fop.jar
	29	gdata-calendar-1.0.jar
	30	gdata-client-1.0.jar
	31	geronimo-j2ee-management_1.0_spec-1.0.jar
	32	gson-1.5.jar
	33	h2-1.2.130.jar
	34	hibernate-3.3.1.ga.jar
	35	hsqldb-1.7.3.3.jar
	36	ical4j-head-20100601.jar BSD License
	37	ical4j-vcard-0.9.3-SNAPSHOT.jar BSD License
	38	imap-1.4.jar
	39	jakarta-oro-2.0.8.jar
	40	javassist-3.4.GA.jar Mozilla Public License, Version 1.1
	41	jaxb-impl-2.1.8.jar
	42	jaxb-xjc-2.1.7.jar
	43	jaxws-rt-2.1.4.jar
	44	jaxws-tools-2.1.4.jar
	45	jboss-j2se-5.1.0.GA.jar
	46	jgroups-2.2.8.jar
	47	jms-1.1.jar
	48	jstl-1.1.2.jar Commons Development and Distribution License, Version 1.0
	49	jstl-standard-1.1.2.jar
	50	jta-1.1.jar Commons Development and Distribution License, Version 1.0
	51	jtidy.jar
	52	junit-4.4.jar
	53	log4j-1.2.8.jar
	54	lucene-core-2.0.0.jar
	55	lucene-misc-2.0.0.jar
	56	mailapi-1.4.jar
	57	pluto-1.0.1-rc2.jar
	58	pop3-1.4.jar
	59	portals-bridges-common-1.0.jar
	60	portals-bridges-struts-1.2.7-1.0.jar
	61	portlet-api-1.0.jar Commons Development and Distribution License, Version 1.0
	62	serializer-2.7.1.jar
	63	servlet.jsp.jar
	64	servletapi-2.4.jar Commons Development and Distribution License, Version 1.0
	65	slf4j-api-1.5.6.jar MIT License
	66	slf4j-log4j12-1.5.6.jar MIT License
	67	smtp-1.4.jar
	68	stax-ex-2.2.1.jar
	69	streambuffer-1.0.jar
	70	struts-1.2.9.jar
	71	xalan-2.7.1.jar Apache License, Version 2.0
	72
	73	-- Not in Eric's XML
	74
	75	activation-1.4.jar - ? Sun
	76	activemq-core-5.3.0.jar Apache License, Version 2.0
	77
	78

trunk/resources/exsynchwsdefs/iCalendar-params.xsd

r3103	r3105
183	183
184	184	<!-- 3.2.7 Inline Encoding -->
	185
185	186	<xs:simpleType name="encodingValueType">
186		<xs:restriction base="xs:~~token~~">
	187	<xs:restriction base="xs:string">
187	188	<xs:enumeration value="8BIT"/>
188	189	<xs:enumeration value="BASE64"/>
…	…
199	200	</xs:complexContent>
200	201	</xs:complexType>
201
	202
202	203	<!-- 3.2.8 Format Type -->
203	204	<xs:complexType name="fmttypeParamType">
…	…
209	210	<!-- 3.2.9 Free/Busy Time Type -->
210	211	<xs:simpleType name="fbtypeValueType">
211		<xs:restriction base="xs:~~token~~">
	212	<xs:restriction base="xs:string">
212	213	<xs:enumeration value="FREE"/>
213	214	<xs:enumeration value="BUSY"/>

Changeset Navigation

Changeset 3105

Legend:

Download in other formats: