Revision 023f6f1e build.xml

b/build.xml
8 8
	<property name="root.context" value="gss" />
9 9
	<property name="gwt.module" value="gr.ebs.gss.GSS" />
10 10
	<property name="gwt.module.class" value="GSS" />
11
	<property name="gwt.admin.module" value="gr.ebs.gss.admin.TwoAdmin" />
12
	<property name="gwt.admin.module.class" value="TwoAdmin" />
11 13
	<property name="gwt.workers" value="1" />
12 14

  
13 15
	<property environment="env" />
......
63 65
	<property name="test.build.dir" value="${build.dir}" />
64 66
	<property name="test.build.classes.dir" value="${test.build.dir}/" />
65 67
	<property name="gwt.www.dir" value="${basedir}/www" />
68
	<property name="gwt.www.admin.dir" value="${basedir}/wwwadmin" />
66 69
	<property name="dist.war" value="${ant.project.name}.war"/>
70
	<property name="dist.admin.war" value="${ant.project.name}-admin.war"/>
67 71
	<property name="webdav.war" value="webdav.war"/>
68 72
	<property name="dist.ear" value="${ant.project.name}.ear"/>
69 73

  
70 74
	<property name="war.dir" value="${basedir}/war" />
71 75
	<property name="war.web-inf.dir" value="${war.dir}/WEB-INF"/>
72 76
	<property name="war.lib.dir" value="${war.web-inf.dir}/lib"/>
77
	<property name="war.admin.dir" value="${basedir}/waradmin" />
78
	<property name="war.admin.web-inf.dir" value="${war.dir}/WEB-INF"/>
79
	<property name="war.admin.lib.dir" value="${war.web-inf.dir}/lib"/>
73 80
	<property name="webdav.war.dir" value="${basedir}/webdav" />
74 81
	<property name="webdav.war.web-inf.dir" value="${webdav.war.dir}/WEB-INF"/>
75 82
	<property name="webdav.war.lib.dir" value="${webdav.war.web-inf.dir}/lib"/>
......
103 110
		<pathelement location="${junit.path}/junit.jar"/>
104 111
		<pathelement location="${basedir}/lib/gwt-dnd-3.0.1.jar"/>
105 112
		<pathelement location="${basedir}/lib/gwt-gears.jar"/>
106
		
113
		<pathelement location="${basedir}/lib/gwt-incubator-20100204-r1747.jar"/>
114
		<pathelement location="${basedir}/lib/gwt-visualization.jar"/>
107 115
	</path>
108 116

  
109 117
	<target name="install" description="Installs the configuration files of the application server">
......
209 217
		<jar destfile="${build.dir}/${ant.project.name}.jar">
210 218
			<fileset dir="bin">
211 219
				<include name="org/json/**" />
220
				<include name="**/client/AdminService.class" />
212 221
				<include name="**/server/**" />
213 222
				<exclude name="**/domain/**"/>
214 223
				<exclude name="**/ejb/**"/>
215
				<exclude name="**/soap/**"/>
216 224
			</fileset>
225
			<fileset dir="src">
226
				<include name="**/*.xml" />
227
				<include name="**/client/exceptions/**" />
228
				</fileset>
217 229
		</jar>
218 230
	</target>
219 231

  
......
233 245
				<include name="**/exceptions/**" />
234 246
				<include name="**/domain/**" />
235 247
				<include name="**/ejb/**" />
236
				<include name="**/soap/**" />
237 248
				<exclude name="**/*Test.class"/>
238 249
			</zipfileset>
239 250
		</jar>
......
245 256
			<mergemapper to="${build.dir}/www/gr.ebs.gss.GSS.nocache.js"/>
246 257
		</uptodate>
247 258
	</target>
248
	
259

  
249 260
	<target name="gwt-compile" depends="check-gwt-compile" unless="compilation-not-needed" description="Compile client code to JavaScript">
250
	    	<condition property="gwt-dev-lib" value="${gwt.path}/gwt-dev.jar">
251
		    	<available file="${gwt.path}/gwt-dev.jar" />
252
	    	</condition>
261
    	<condition property="gwt-dev-lib" value="${gwt.path}/gwt-dev.jar">
262
	    	<available file="${gwt.path}/gwt-dev.jar" />
263
    	</condition>
264
		
265
		<java classname="com.google.gwt.dev.Compiler" failonerror="true" fork="true">
266
			<!--arg value="-style"/>
267
			<arg value="DETAILED"/-->
268
			<arg value="-localWorkers" />
269
			<arg value="${gwt.workers}" />
270
			<arg value="-war"/>
271
			<arg value="${gwt.www.dir}"/>
272
			<arg value="${gwt.module}"/>
253 273
			
254
			<java classname="com.google.gwt.dev.Compiler" failonerror="true" fork="true">
255
				<!--arg value="-style"/>
256
 				<arg value="DETAILED"/-->
257
				<arg value="-localWorkers" />
258
				<arg value="${gwt.workers}" />
259
				<arg value="-war"/>
260
				<arg value="${gwt.www.dir}"/>
261
				<arg value="${gwt.module}"/>
262
				
263
			    <classpath>
264
			    	<pathelement location="dist/test.jar"/>
265
			        <pathelement path="${gwt-dev-lib}"/>
266
					<path refid="project.class.path" />
267
					<pathelement path="${src.dir}" />
268
			    </classpath>
269
			</java>
270
			<mkdir dir="${build.dir}/www"/>
271
			<copy todir="${build.dir}/www">
272
				<fileset dir="${gwt.www.dir}/${gwt.module}" excludes="**/${gwt.module.class}.html">
273
				</fileset>
274
			</copy>
275
			<copy file="${gwt.www.dir}/${gwt.module}/${gwt.module.class}.html" tofile="${build.dir}/www/index.html" />
276
		</target>
274
		    <classpath>
275
		        <pathelement path="${gwt-dev-lib}"/>
276
				<path refid="project.class.path" />
277
				<pathelement path="${src.dir}" />
278
		    </classpath>
279
		</java>
280
		<mkdir dir="${build.dir}/www"/>
281
		<copy todir="${build.dir}/www">
282
			<fileset dir="${gwt.www.dir}/${gwt.module}" excludes="**/${gwt.module.class}.html">
283
			</fileset>
284
		</copy>
285
		<copy file="${gwt.www.dir}/${gwt.module}/${gwt.module.class}.html" tofile="${build.dir}/www/index.html" />
286
	</target>
277 287
	
278 288
	<target name="package-war" depends="gwt-compile, package-code" description="Package up the web part as a war">
279 289
		<jar destfile="${build.dir}/${dist.war}">
280 290
			<zipfileset dir="${war.dir}" >
281
			                                <exclude name="**/classes/**"/>
282
			                                </zipfileset>
283

  
291
			    <exclude name="**/classes/**"/>
292
			</zipfileset>
284 293
			<zipfileset dir="${build.dir}/www" />
285 294
			<zipfileset dir="${build.dir}" prefix="WEB-INF/lib">
286 295
				<include name="${ant.project.name}.jar" />
287 296
			</zipfileset>
297
		</jar>
298
	</target>
299
	
300
	<target name="check-gwt-admin-compile" depends="compile">
301
		<uptodate property="compilation-not-needed">
302
			<srcfiles dir="${src.dir}" excludes="**/server/**"/>
303
			<mergemapper to="${build.dir}/wwwadmin/gr.ebs.gss.admin.TwoAdmin.nocache.js"/>
304
		</uptodate>
305
	</target>
306

  
307
	<target name="gwt-admin-compile" depends="check-gwt-admin-compile" unless="compilation-not-needed" description="Compile client code to JavaScript">
308
    	<condition property="gwt-dev-lib" value="${gwt.path}/gwt-dev.jar">
309
	    	<available file="${gwt.path}/gwt-dev.jar" />
310
    	</condition>
311
		
312
		<java classname="com.google.gwt.dev.Compiler" failonerror="true" fork="true">
313
			<!--arg value="-style"/>
314
			<arg value="DETAILED"/-->
315
			<arg value="-localWorkers" />
316
			<arg value="${gwt.workers}" />
317
			<arg value="-war"/>
318
			<arg value="${gwt.www.admin.dir}"/>
319
			<arg value="${gwt.admin.module}"/>
320
            <jvmarg value="-Xmx128m"/>						
321
		    <classpath>
322
		        <pathelement path="${gwt-dev-lib}"/>
323
				<path refid="project.class.path" />
324
				<pathelement path="${src.dir}" />
325
		    </classpath>
326
		</java>
327
		<mkdir dir="${build.dir}/wwwadmin"/>
328
		<copy todir="${build.dir}/wwwadmin">
329
			<fileset dir="${gwt.www.admin.dir}/${gwt.admin.module}" excludes="**/${gwt.admin.module.class}.html">
330
			</fileset>
331
		</copy>
332
		<copy file="${gwt.www.admin.dir}/${gwt.admin.module}/${gwt.admin.module.class}.html" tofile="${build.dir}/wwwadmin/index.html" />
333
	</target>
334
		
335
	<target name="package-admin-war" depends="gwt-admin-compile, package-code" description="Package up the web part as a war">
336
		<jar destfile="${build.dir}/${dist.admin.war}">
337
			<zipfileset dir="${war.admin.dir}" >
338
				  <exclude name="**/classes/**"/>
339
            </zipfileset>
340
			<zipfileset dir="${build.dir}/wwwadmin" />
341
			<zipfileset dir="${build.dir}" prefix="WEB-INF/lib">
342
				<include name="${ant.project.name}.jar" />
343
			</zipfileset>
288 344
			<zipfileset dir="${gwt.path}" prefix="WEB-INF/lib">
289 345
				<include name="gwt-servlet.jar" />
290 346
			</zipfileset>
......
307 363
		</jar>
308 364
	</target>
309 365
	
310
	<target name="package-ear" depends="package-war, package-webdav-war, package-ejb, package-mbeans" description="Package up the project as an ear">
366
	<target name="package-ear" depends="package-admin-war, package-war, package-webdav-war, package-ejb, package-mbeans" description="Package up the project as an ear">
311 367
		<jar destfile="${build.dir}/${dist.ear}">
312 368
			<zipfileset dir="${ear.dir}" />
313 369
			<zipfileset dir="${build.dir}">
314 370
				<include name="ejbs.jar" />
315 371
				<include name="${dist.war}" />
316 372
				<include name="${webdav.war}" />
373
                <include name="${dist.admin.war}" />
317 374
				<include name="${mbeans.dist.file}"/>
318 375
			</zipfileset>
319 376
		</jar>
......
338 395
	<target name="clean" description="Delete the contents of the bin and www directories">
339 396
		<delete dir="${build.dir}" />
340 397
		<delete dir="${gwt.www.dir}" />
398
		<delete dir="${gwt.www.admin.dir}" />
341 399
	</target>
342 400

  
343 401
	<target name="test" description="Performs unit tests on the project" depends="compile">

Also available in: Unified diff