Project

General

Profile

« Previous | Next » 

Revision 8803

Added by ben leinfelder over 10 years ago

switch to use utilities from Maven repo instead of pulling from SVN and building locally. Added trunk/SNAPSHOT build to dev-testing Hudson (DataONE) for users who do not actively develop the utilities library. Motivated by the HTML->PDF utility, seemed like as good a time as any to convert Metacat's dependency on the project.

View differences:

pom.xml
36 36 
    </repositories>
37 37 
    <dependencies>
38 38 
    	<dependency>
39 
			<groupId>org.xhtmlrenderer</groupId>
40 
			<artifactId>core-renderer</artifactId>
41 
			<version>R8</version>
39 
			<groupId>edu.ucsb.nceas</groupId>
40 
			<artifactId>utilities</artifactId>
41 
			<version>2.0.0-SNAPSHOT</version>
42 42 
		</dependency>
43 
		<dependency>
44 
			<groupId>net.sf.jtidy</groupId>
45 
			<artifactId>jtidy</artifactId>
46 
			<version>r938</version>
47 
		</dependency>
48 43 
    	<dependency>
49 44 
    		<groupId>gov.loc</groupId>
50 45 
			<artifactId>bagit</artifactId>
build.xml
140 140 

  		




  141
  141
  
    
		<property name="debug" value="on" />


  		




  142
  142
  
    
		<property name="morphosourcedir" value="../morpho" />


  		




  143
  
  
    
		<property name="utilitiesdir" value="../utilities" />


  		




  144
  143
  
    
		<property name="installdir"


  		




  145
  144
  
    
			value="${app.deploy.dir}/${metacat.context}" />


  		




  146
  145
  
    

  		




  ......




  230
  229
  
    
			value="lib${style-common-relpath}" />


  		




  231
  230
  
    
		<property name="schema-cvsrelpath" value="lib${schema-relpath}" />


  		




  232
  231
  
    
		<property name="style-skins-relpath" value="/style/skins" />


  		




  233
  
  
    
		<property name="util-module" value="utilities" />


  		




  234
  
  
    
		<property name="utilities-tag" value="trunk" />


  		




  235
  
  
    
		<!--<property name="utilities-tag" value="tags/UTILITIES_1_3_0" /> -->


  		




  236
  232
  
    
		<property name="seek-tag" value="branches/ECOGRID_1_2_3" />


  		




  237
  233
  
    
		<property name="eml-module" value="eml" />


  		




  238
  234
  
    
		<property name="eml-version" value="2.0.0beta6" />


  		




  ......




  369
  365
  
    
		<property name="dist.dir" value="dist" />


  		




  370
  366
  
    
		<property name="ver.dir" value="${dist.dir}/${name}-${release}" />


  		




  371
  367
  
    
		<property name="ver.src" value="${ver.dir}/src" />


  		




  372
  
  
    
		<property name="util.dir" value="${dist.dir}/${util-module}" />


  		




  373
  368
  
    
		<property name="test.dir" value="${dist.dir}/test" />


  		




  374
  369
  
    
		<!-- directories for creating a Harvest List Editor distribution -->


  		




  375
  370
  
    
		<property name="dist.dir.hle" value="disthle" />


  		




  ......




  395
  390
  
    
			value="${svnant.lib}/svnClientAdapter.jar" />


  		




  396
  391
  
    
		<property name="svnjavahl.jar"


  		




  397
  392
  
    
			value="${svnant.lib}/svnjavahl.jar" />


  		




  398
  
  
    
		<property name="svn.utilitiesUrl"


  		




  399
  
  
    
			value="https://code.ecoinformatics.org/code/utilities/${utilities-tag}" />


  		




  400
  393
  
    
		<property name="svn.ecogridUrl"


  		




  401
  394
  
    
			value="https://code.ecoinformatics.org/code/seek/${seek-tag}/projects/ecogrid/" />


  		




  402
  395
  
    
		<property name="svn.emlBetaUrl"


  		




  ......




  435
  428
  
    
		<taskdef resource="svntask.properties"


  		




  436
  429
  
    
			classpathref="svn.classpath" />


  		




  437
  430
  
    

  		




  438
  
  
    
		<condition property="utilities.required">


  		




  439
  
  
    
			<not>


  		




  440
  
  
    
				<available file="lib/utilities.jar" />


  		




  441
  
  
    
			</not>				


  		




  442
  
  
    
		</condition>


  		




  443
  
  
    
		<!-- peer.utilities.required is used when there is no utilities 


  		




  444
  
  
    
			directory at ${utilitiesdir} -->


  		




  445
  
  
    
		<condition property="peer.utilities.required">


  		




  446
  
  
    
			<or>


  		




  447
  
  
    
				<not>


  		




  448
  
  
    
					<available file="${utilitiesdir}" type="dir" />


  		




  449
  
  
    
				</not>


  		




  450
  
  
    
			</or>


  		




  451
  
  
    
		</condition>


  		




  452
  431
  
    
		<condition property="eml.required">


  		




  453
  432
  
    
			<or>


  		




  454
  433
  
    
				<not>


  		




  ......




  526
  505
  
    
			url="/tmp/KeplerWebService.wsdl" />


  		




  527
  506
  
    
	</target>


  		




  528
  507
  
    

  		




  529
  
  
    
	<target name="compile" depends="prepare, utilities"


  		




  
  508
  
    
	<target name="compile" depends="prepare"


  		




  530
  509
  
    
		description="Compiles java code to build dir, and copies metacat props files there">


  		




  531
  510
  
    

  		




  532
  511
  
    
		<javac srcdir="${build.src}" destdir="${build.dest}"


  		




  ......




  553
  532
  
    
			includes="**/protocols/" />


  		




  554
  533
  
    
	</target>


  		




  555
  534
  
    

  		




  556
  
  
    
	<target name="utilities" depends="config,getpeerutilities"


  		




  557
  
  
    
		if="utilities.required">


  		




  558
  
  
    
		<ant dir="${utilitiesdir}" target="clean" inheritAll="false" />


  		




  559
  
  
    
		<ant dir="${utilitiesdir}" target="jar" inheritAll="false" />


  		




  560
  
  
    
		<copy file="${utilitiesdir}/build/utilities.jar" todir="lib" />


  		




  561
  
  
    
	</target>


  		




  562
  535
  
    

  		




  563
  
  
    
	<target name="getpeerutilities" depends="prepare"


  		




  564
  
  
    
		if="peer.utilities.required"


  		




  565
  
  
    
		description="Checks utilities out of svn and copies it to your utilitiesdir if it does not already exist">


  		




  566
  
  
    
		<echo message="Exporting utilities files from svn repository:" />


  		




  567
  
  
    
		<svn>


  		




  568
  
  
    
			<export srcUrl="${svn.utilitiesUrl}"


  		




  569
  
  
    
				destPath="${utilitiesdir}" />


  		




  570
  
  
    
		</svn>


  		




  571
  
  
    

  		




  572
  
  
    
		<!--  ant dir="${utilitiesdir}" inheritAll="false"  target="dist" / -->


  		




  573
  
  
    
	</target>


  		




  574
  
  
    
	


  		




  575
  
  
    
	<target name="getutilities" depends="prepare"


  		




  576
  
  
    
		description="Checks utility out of svn and copies it to your metacat sandbox">


  		




  577
  
  
    
		<svn>


  		




  578
  
  
    
			<export srcUrl="${svn.utilitiesUrl}"


  		




  579
  
  
    
				destPath="${utilitiesdir}" force="true" />


  		




  580
  
  
    
		</svn>


  		




  581
  
  
    
	</target>


  		




  582
  
  
    

  		




  583
  
  
    
	<target name="client" depends="utilities, prepare"


  		




  
  536
  
    
	<target name="client" depends="prepare"


  		




  584
  537
  
    
		description="Compiles metacat-client java code to build dir">


  		




  585
  538
  
    
		<javac srcdir="${build.src}" destdir="${build.dest}"


  		




  586
  539
  
    
			includes="edu/ucsb/nceas/metacat/client/*">


  		




  ......




  1381
  1334
  
    
		<delete dir="${dist.dir}" />


  		




  1382
  1335
  
    
	</target>


  		




  1383
  1336
  
    

  		




  1384
  
  
    
	<target name="localclean" depends="clean"


  		




  1385
  
  
    
		description="deletes even jars that depend on external sources such as stylesheets and jars">


  		




  1386
  
  
    
		<delete file="lib/utilities.jar" />


  		




  1387
  
  
    
	</target>


  		




  1388
  
  
    

  		




  1389
  
  
    
	<target name="fullclean" depends="localclean"


  		




  
  1337
  
    
	<target name="fullclean" depends="clean"


  		




  1390
  1338
  
    
		description="deletes code and eml">


  		




  1391
  1339
  
    
		<delete includeEmptyDirs="true" failonerror="false">


  		




  1392
  1340
  
    
			<fileset dir="${style-common-cvsrelpath}">


  		




  ......




  1400
  1348
  
    
			<fileset dir="${ecogrid-dir}"/>


  		




  1401
  1349
  
    
			<fileset dir="lib/style/common/emlb6toeml2"/>


  		




  1402
  1350
  
    
			<fileset dir="lib/dtd"/>


  		




  1403
  
  
    
			<fileset dir="${utilitiesdir}"/>


  		




  1404
  1351
  
    
			<fileset dir="${libdir.mvn}"/>


  		




  1405
  1352
  
    
		</delete>


  		




  1406
  1353
  
    
		<!-- remove the entire directory -->


  		




  ......




  1446
  1393
  
    
	</target>


  		




  1447
  1394
  
    

  		




  1448
  1395
  
    
	<target name="dist"


  		




  1449
  
  
    
		depends="geteml,get-ecogrid,jar,protocol,documentation,getConversionXSL,getutilities"


  		




  
  1396
  
    
		depends="geteml,get-ecogrid,jar,protocol,documentation,getConversionXSL"


  		




  1450
  1397
  
    
		description="prepares a full release distribution">


  		




  1451
  1398
  
    
		<mkdir dir="${dist.dir}" />


  		




  1452
  1399
  
    
		<delete dir="${ver.dir}" />


  		




  ......




  1502
  1449
  
    
		<copy todir="${ver.src}">


  		




  1503
  1450
  
    
			<fileset dir="./src" />


  		




  1504
  1451
  
    
		</copy>


  		




  1505
  
  
    
		<mkdir dir="${util.dir}" />


  		




  1506
  
  
    
		<copy todir="${util.dir}">


  		




  1507
  
  
    
			<fileset dir="${utilitiesdir}" excludes="**/CVS*" />


  		




  1508
  
  
    
		</copy>


  		




  
  1452
  
    
		


  		




  1509
  1453
  
    

  		




  1510
  1454
  
    
		<mkdir dir="${ecogrid-dist-dir}" />


  		




  1511
  1455
  
    
		<copy todir="${ecogrid-dist-dir}">


  		




  1512
  1456
  
    
			<fileset dir="${ecogrid-dir}" excludes="**/CVS*" />


  		




  1513
  1457
  
    
		</copy>


  		




  1514
  1458
  
    

  		




  1515
  
  
    
		<delete file="${ver.dir}/lib/utilities.jar" />


  		




  1516
  1459
  
    

  		




  1517
  1460
  
    
		<delete file="./${name}-src-${release}.zip" />


  		




  1518
  1461
  
    
		<zip zipfile="./${name}-src-${release}.zip"


  		




  ......




  1613
  1556
  
    
	</patternset>


  		




  1614
  1557
  
    
	<patternset id="lib.jars">


  		




  1615
  1558
  
    
		<include name="log4j-1.2.12.jar" />


  		




  1616
  
  
    
		<include name="utilities.jar" />


  		




  
  1559
  
    
		<include name="utilities-*.jar" />


  		




  1617
  1560
  
    
		<include name="xerces*.jar" />


  		




  1618
  1561
  
    
		<include name="xalan*.jar" />


  		




  1619
  1562
  
    
		<include name="xml-apis*.jar" />


  		




  ......




  1645
  1588
  
    
			value="${config.lsidauthority}" / -->


  		




  1646
  1589
  
    
	</filterset>


  		




  1647
  1590
  
    

  		




  1648
  
  
    
	<target name="prepare-lsid" depends="prepare,utilities,clientjar"


  		




  
  1591
  
    
	<target name="prepare-lsid" depends="prepare,clientjar"


  		




  1649
  1592
  
    
		description="Configure files prior to compilation">


  		




  1650
  1593
  
    
		<mkdir dir="${lsid.build.dir}" />


  		




  1651
  1594
  
    
		<!-- Copy the properties file into the build -->


  		












Also available in:  Unified diff