Project

General

Profile

Revision 6438

remove unused/old D1 SCHEMA downloads and build tasks

View differences:

build.xml
61 61
		<equals arg1="${make.perl.code}" arg2="true" />
62 62
	</condition>
63 63

  
64
	<!-- Determine if dataone-service should be built-->
65
	<condition property="d1.available">
66
        <and>
67
	        <available file="${d1.dir}"/>
68
	        <available file="${maven.home}"/>
69
        </and>
70
	</condition>
71

  
72 64
	<available file="${build.tomcat.dir}/common/lib/servlet-api.jar" 
73 65
			property="tomcat.common.exists" />
74 66

  
......
185 177
		<property name="eml2_0_1-schema-tag" value="RELEASE_EML_2_0_1" />
186 178
		<property name="eml2_1_0-schema-tag" value="RELEASE_EML_2_1_0" />
187 179
		<property name="eml2_1_1-schema-tag" value="RELEASE_EML_2_1_1_RC_2" />
188
		<property name="dataone-schema-tag" value="D1_SCHEMA_0_6_2" />
189 180
		<property name="eml2-style-tag" value="RELEASE_EML_UTILS_1_0_0_RC12" />
190 181
		<property name="eml2_0_0namespace"
191 182
			value="eml://ecoinformatics.org/eml-2.0.0" />
......
280 271
		<property name="docdir" value="./docs" />
281 272
		<property name="cgidir" value="./cgi-bin" />
282 273
		<property name="testdir" value="./test" />
283
		<property name="testtorun" value="QueryGroupTest" />
274
		<property name="testtorun" value="HazelcastServiceTest" />
284 275
		<property name="junittestsdir"
285 276
			value="./test/edu/ucsb/nceas/metacattest" />
286 277
		<property name="junitnettestsdir"
......
341 332
			value="https://code.ecoinformatics.org/code/eml/tags/${eml2_1_0-schema-tag}" />
342 333
		<property name="svn.eml211SchemaUrl"
343 334
			value="https://code.ecoinformatics.org/code/eml/tags/${eml2_1_1-schema-tag}" />
344
		<property name="svn.dataone-0.1-schema-url"
345
			value="https://repository.dataone.org/software/cicore/branches/${dataone-schema-tag}" />
346 335
		<property name="svn.eml2StyleUrl"
347 336
			value="https://code.ecoinformatics.org/code/eml/tags/${eml2-style-tag}" />
348 337

  
......
436 425
			url="/tmp/KeplerWebService.wsdl" />
437 426
	</target>
438 427

  
439
	<target name="compile" depends="dataone-service,prepare,utilities"
428
	<target name="compile" depends="prepare,utilities"
440 429
		description="Compiles java code to build dir, and copies metacat props files there">
441 430

  
442 431
		<javac srcdir="${build.src}" destdir="${build.dest}"
......
448 437
		</javac>
449 438
	</target>
450 439

  
451
	<target name="jar" depends="compile,geteml,getd1schemas"
440
	<target name="jar" depends="compile,geteml"
452 441
		description="Compiles and jars metacat java code to metacat.jar in build dir ">
453 442

  
454 443
		<delete file="${build.dir}/${name}.jar" />
......
668 657
			</fileset>
669 658
		</copy>
670 659
	</target>
671
	
672
	<!-- copies the dataone schemas from a local source if you don't want
673
	     to have to make a ton of svn calls when you're testing (see getd1schemas) -->
674
	<target name="install-dataone" depends="init">
675
	  <property name="dataone-shema-dir" value="../cicore/schemas"/>
676
	  <property name="install-dataone-schema-dir" value="${installdir}/schema/${dataone-schema-tag}"/>
677
	  <mkdir dir="${install-dataone-schema-dir}"/>
678
	  <copy todir="${install-dataone-schema-dir}">
679
	    <fileset dir="${dataone-shema-dir}">
680
	      <include name="**/*.xsd"/>
681
	    </fileset>
682
	  </copy>
683
	</target>
684 660

  
685
	<!-- get the dataone schemas from svn -->
686
	<target name="getd1schemas" depends="prepare" 
687
		description="Checkout dataone schemas from svn and copy to metacat sandbox">
688
		<delete dir="${build.tmp}/${dataone-schema-tag}"/>
689
        <svn>
690
            <export srcUrl="${svn.dataone-0.1-schema-url}"
691
                destPath="${build.tmp}/${dataone-schema-tag}" />
692
        </svn>
693
        <mkdir dir="lib/schema/${dataone-schema-tag}" />
694
        <copy todir="lib/schema/${dataone-schema-tag}" filtering="yes">
695
            <fileset dir="${build.tmp}/${dataone-schema-tag}">
696
                <include name="*.xsd" />
697
            </fileset>
698
        </copy>
699
    </target>
700

  
701 661
	<target name="copyxsl"
702 662
		description="Copies xsl stylesheets from checkout in build/tmp to your metacat sandbox">
703 663

  
......
1290 1250
	</target>
1291 1251

  
1292 1252
	<target name="dist"
1293
		depends="geteml,getd1schemas,get-ecogrid,jar,protocol,jdoc,getConversionXSL,getutilities"
1253
		depends="geteml,get-ecogrid,jar,protocol,jdoc,getConversionXSL,getutilities"
1294 1254
		description="prepares a full release distribution">
1295 1255
		<mkdir dir="${dist.dir}" />
1296 1256
		<delete dir="${ver.dir}" />
......
1591 1551
        description="Install a metacat by the default value in metacat.properties without additional configutaion">
1592 1552
    </target>
1593 1553
	
1594

  
1595
    <!-- Build the dataone service, but only if it is checked out as a
1596
         sibling of the current build directory. Requires maven2 to
1597
         be installed and on the path. -->
1598
    <target name="dataone-service" if="d1.available">
1599
        <property name="d1.jar" value="d1_common_java-0.6.2-SNAPSHOT.jar"/>
1600
        <artifact:mvn pom="${d1.dir}/pom.xml" fork="true"
1601
                      mavenHome="${maven.home}">
1602
            <arg value="install"/>
1603
        </artifact:mvn>
1604
		<copy file="${d1.dir}/target/${d1.jar}" todir="${lib.dir}" />
1605
  </target>
1606 1554
</project>

Also available in: Unified diff