Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 269

Timestamp:

03/08/06 11:47:56

Author:

douglm

Message:

Changes to allow build of suite for jboss

Creates a single ear file with all components.

Requires ant version 1.6.5. Changes ant scripts in quickstart to avoid some problems with running different versions.

Added an ant task to the deployment suite to build an application.xml file
Fixed a serialization problem in client code.

Files:

trunk/calendar3/bldfiles/application.xml (deleted)
trunk/calendar3/bldfiles/buildApplication.xml (deleted)
trunk/calendar3/bldfiles/buildwar.xml (modified) (2 diffs)
trunk/calendar3/bldfiles/defjars.properties (modified) (2 diffs)
trunk/calendar3/deployment/build.xml (modified) (3 diffs)
trunk/calendar3/deployment/src (added)
trunk/calendar3/deployment/src/org (added)
trunk/calendar3/deployment/src/org/bedework (added)
trunk/calendar3/deployment/src/org/bedework/deployment (added)
trunk/calendar3/deployment/src/org/bedework/deployment/ApplicationXmlTask.java (added)
trunk/calendar3/deployment/termination/jboss/build.xml (modified) (2 diffs)
trunk/calendar3/deployment/webadmin/jboss/build.xml (modified) (1 diff)
trunk/calendar3/deployment/webpublic/jboss/build.xml (modified) (1 diff)
trunk/calendar3/deployment/webuser/jboss/build.xml (modified) (1 diff)
trunk/calendar3/lib/ant-1.6.5.jar (added)
trunk/calendar3/lib/ical4j-0.9.18.jar (deleted)
trunk/calendar3/webclient/war/WEB-INF/jboss-web.xml (modified) (1 diff)
trunk/calendar3/webcommon/src/org/bedework/webcommon/BwActionFormBase.java (modified) (3 diffs)

Legend:

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

trunk/calendar3/bldfiles/buildwar.xml

r268	r269
55	55
56	56	<!-- Destinations - where we build an unwrapped war -->
57		<property name="app.dest.~~home~~"
	57	<property name="app.dest.war"
58	58	location="${org.bedework.temp.wars.home}/${propval.war.name}.war" />
59		~~<property name="app.dest.war"~~
60		~~location="${app.dest.home}/war" />~~
61	59	<property name="app.dest.docs"
62	60	location="${app.dest.war}/docs" />
…	…
89	87	<target name="init.j2ee" if="org.bedework.global.j2ee.platform">
90	88	<property name="app.dest.lib"
91		location="${org.bedework.temp.home}/ear/lib" />
	89	location="${org.bedework.temp.home}/earlib" />
92	90	</target>
93	91
94	92	<target name="build" depends="init">
95		<delete dir="${app.dest.~~home~~}" />
	93	<delete dir="${app.dest.war}" />
96	94
97	95	<!-- Add modifed login pages -->

trunk/calendar3/bldfiles/defjars.properties

r261	r269
10	10	# supplied by your servlet container.
11	11	servlet.jar=${org.bedework.default.lib}/servletapi-2.4.jar
	12
	13	ant.jar=${org.bedework.default.lib}/ant-1.6.5.jar
12	14
13	15	p6spy.jar=${org.bedework.default.lib}/p6spy-1.3.jar
…	…
124	126	org.bedework.config.jar=${org.bedework.temp.jars}/${org.bedework.config.jar.name}
125	127
	128	org.bedework.deployment.jar.name=bwdeployment-${product.version}.jar
	129	org.bedework.deployment.jar=${org.bedework.temp.jars}/${org.bedework.deployment.jar.name}
	130
126	131	org.bedework.dumprestore.jar.name=bwdumprestore-${product.version}.jar
127	132	org.bedework.dumprestore.jar=${org.bedework.temp.jars}/${org.bedework.dumprestore.jar.name}

trunk/calendar3/deployment/build.xml

r268	r269
27	27
28	28	<project name="deploy.bedework" default="init">
	29	<property name="base.name" value="deployment"/>
	30
29	31	<target name="init" >
	32	<dirname property="this.build.dir" file="${ant.file}"/>
	33
	34	<property name="source.home" location="${this.build.dir}/src"/>
	35
30	36	<!-- default to debug off -->
31	37	<property name="app.debug.val" value="0" />
…	…
49	55	</target>
50	56
51		<target name="build.configured" depends="init" >
	57	<target name="build" depends="init"
	58	description="Compile deployment Java sources">
	59	<!-- ==================== Sources and classes ====================== -->
	60
	61	<fileset id="base.java.sources" dir="${source.home}" >
	62	<include name="org/bedework/deployment/*.java"/>
	63	<include name="org/bedework/deployment/*.java"/>
	64	</fileset>
	65
	66	<patternset id="base.class.patternset">
	67	<include name="org/bedework/deployment/*.class"/>
	68	<include name="org/bedework/deployment/*.class"/>
	69	</patternset>
	70
	71	<!-- ==================== Compilation Classpath ==================== -->
	72
	73	<path id="compile.classpath">
	74	<pathelement location="${ant.jar}"/>
	75	</path>
	76
	77	<!-- ==================== Build Target ============================= -->
	78
	79	<property name="build.jar.file" location="${org.bedework.deployment.jar}" />
	80
	81	<ant antfile="${buildjar}" inheritRefs="true" target="build" />
	82	</target>
	83
	84	<target name="build.configured" depends="build" >
52	85	<!-- Clean up before we start -->
53	86	<delete dir="${org.bedework.temp.wars.home}" />
…	…
90	123	================================================================= -->
91	124
92		<target name="deploy" depends="~~init~~" >
	125	<target name="deploy" depends="build" >
93	126	<!-- Clean up before we start -->
94	127	<delete dir="${org.bedework.temp.wars.home}" />

trunk/calendar3/deployment/termination/jboss/build.xml

r268	r269
11	11	<dirname property="this.dir" file="${ant.file}"/>
12	12
	13	<property name="app.ear.file"
	14	location="${dist.home}/${propval.ear.name}.ear" />
13	15	<property name="app.resources.dir"
14	16	location="${this.dir}/../webapp/resources" />
…	…
20	22
21	23	<target name="deploy" depends="init,build.configured" >
22		<delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" />
23		<copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}">
24		<fileset dir="${app.resources.dir}" />
	24	<echo message="***************************************************************" />
	25	<echo message="Building ear file for jboss deployment" />
	26	<echo message="***************************************************************" />
	27
	28	<property name="ear.dir"
	29	location="${org.bedework.temp.home}/ear" />
	30
	31	<path id="app.xml.cp">
	32	<pathelement location="${org.bedework.deployment.jar}"/>
	33	</path>
	34
	35	<taskdef name="applicationXml"
	36	classname="org.bedework.deployment.ApplicationXmlTask">
	37	<classpath refid="app.xml.cp"/>
	38	</taskdef>
	39
	40	<!-- We have to drop some of the libraries so they don't conflict -->
	41	<copy toDir="${ear.dir}">
	42	<fileset dir="${org.bedework.temp.home}/earlib">
	43	<exclude name="commons-logging*" />
	44	<exclude name="log4j*" />
	45	</fileset>
25	46	</copy>
26	47
27		<echo message="***************************************************************" />
28		<echo message="Readying app ${propval.war.name}.war for jboss deployment" />
29		<echo message="***************************************************************" />
	48	<applicationXml displayName="Bedework calendar suite"
	49	outFile="${ear.dir}/META-INF/application.xml"
	50	warDir="${org.bedework.temp.home}/wars">
	51	<fileset dir="${ear.dir}">
	52	<include name="*.jar"/>
	53	</fileset>
	54	</applicationXml>
	55
	56	<manifest file="${ear.dir}/META-INF/MANIFEST.MF" />
	57
	58	<copy toDir="${ear.dir}">
	59	<fileset dir="${org.bedework.temp.home}/wars"/>
	60	</copy>
	61
	62	<zip destfile="${app.ear.file}"
	63	basedir="${ear.dir}"/>
30	64	</target>
31	65

trunk/calendar3/deployment/webadmin/jboss/build.xml

r268	r269
25	25
26	26	<target name="deploy" depends="init,build.configured" >
27		~~<delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" />~~
28		~~<copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}">~~
29		~~<fileset dir="${app.resources.dir}" />~~
30		~~</copy>~~
31
32	27	<echo message="***************************************************************" />
33	28	<echo message="Readying app ${propval.war.name}.war for jboss deployment" />

trunk/calendar3/deployment/webpublic/jboss/build.xml

r268	r269
25	25
26	26	<target name="deploy" depends="init,build.configured" >
27		~~<delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" />~~
28		~~<copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}">~~
29		~~<fileset dir="${app.resources.dir}" />~~
30		~~</copy>~~
31
32	27	<echo message="***************************************************************" />
33	28	<echo message="Readying app ${propval.war.name}.war for jboss deployment" />

trunk/calendar3/deployment/webuser/jboss/build.xml

r268	r269
25	25
26	26	<target name="deploy" depends="init,build.configured" >
27		~~<delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" />~~
28		~~<copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}">~~
29		~~<fileset dir="${app.resources.dir}" />~~
30		~~</copy>~~
31
32	27	<echo message="***************************************************************" />
33	28	<echo message="Readying app ${propval.war.name}.war for jboss deployment" />

trunk/calendar3/webclient/war/WEB-INF/jboss-web.xml

r2	r269
8	8	<jndi-name>java:/CalendarDS</jndi-name>
9	9	</resource-ref>
10
11		~~<ejb-ref>~~
12		~~<ejb-ref-name>rpi/misc/creds</ejb-ref-name>~~
13		~~<jndi-name>@CREDSEJB-JNDI-NAME@</jndi-name>~~
14		~~</ejb-ref>~~
15	10	</jboss-web>

trunk/calendar3/webcommon/src/org/bedework/webcommon/BwActionFormBase.java

r251	r269
111	111
112	112	// XXX locale - needs to be changed when locale changes
113		private ~~Collator listCollator = Collator.getInstance()~~;
	113	private transient Collator listCollator;
114	114
115	115	/* This should be a cloned copy only */
…	…
1440	1440	public Collection getAddContentCalendarCollections() {
1441	1441	try {
1442		TreeMap tm = new TreeMap(~~listCollator~~);
	1442	TreeMap tm = new TreeMap(getListCollator());
1443	1443
1444	1444	Iterator it = fetchSvci().getAddContentCalendarCollections().iterator();
…	…
2140	2140	}
2141	2141	}
	2142
	2143	// XXX locale - needs to be changed when locale changes
	2144	private Collator getListCollator() {
	2145	if (listCollator == null) {
	2146	listCollator = Collator.getInstance();
	2147	}
	2148
	2149	return listCollator;
	2150	}
2142	2151	}
2143	2152

Changeset Navigation

Changeset 269

Legend:

Download in other formats: