Project

General

Profile

Revision 6003

The DataONE service API jar has been renamed to d1_common_java-0.5.0.jar, updated the build file accordingly. Added debug echo of the test classpath.

View differences:

build.xml
47 47
			<include name="*.jar" />
48 48
		</fileset>
49 49
	</path>
50
	
50
    	
51 51
	<taskdef resource="axis-tasks.properties"
52 52
		classpathref="axis.ant.classpath" />
53 53
	
......
523 523
			</classpath>
524 524
		</javac>
525 525
	</target>
526

  
526
		
527 527
	<target name="harvesterjar" depends="harvester"
528 528
		description="Compiles and jars harvester java code to harvester.jar in build dir">
529 529
		<delete file="${build.dir}/harvester.jar" />
......
1084 1084
		</copy>
1085 1085
		<copy todir="${build.tests}" file="${testdir}/test.properties" />
1086 1086

  
1087
		<path id="test.classpath">
1088
			<path refid="compile.classpath" />
1089
			<fileset dir="${build.dir}">
1090
				<include name="${name}.jar" />
1091
				<include name="${name}-client.jar" />
1092
				<include name="harvester.jar" />
1093
			</fileset>
1094
		</path>
1095
		
1096
		<pathconvert pathsep="${line.separator}|  |--" 
1097
		             property="echo.test.classpath"
1098
		             refid="test.classpath">
1099
		</pathconvert>
1100
		<echo message="|--test classpath" />
1101
		<echo message="|  |" />
1102
		<echo message="|  |-- ${echo.test.classpath}" />
1103
		
1087 1104
		<!-- copy and compile the tests into a jar file -->
1088 1105
		<javac srcdir="${build.tests}" destdir="${build.tests}"
1089 1106
			debug="on" includes="**/*.java" encoding="UTF-8">
1090
			<classpath>
1091
				<path refid="compile.classpath" />
1092
				<fileset dir="${build.dir}">
1093
					<include name="${name}.jar" />
1094
					<include name="${name}-client.jar" />
1095
					<include name="harvester.jar" />
1096
				</fileset>
1097
			</classpath>
1107
			<classpath refid="test.classpath" />
1098 1108
		</javac>
1099 1109

  
1100 1110
		<jar jarfile="${build.dir}/${name}-junittests.jar"
1101 1111
			basedir="${build.tests}" includes="**/*.class" />
1112
		
1102 1113
	</target>
1103 1114

  
1104 1115
	<target name="test" depends="testprep"
......
1583 1594
		   configutil.databaseConfigured=true
1584 1595
		   configutil.geoserverConfigured=true
1585 1596
	   </echo>
1586
    </target>
1597
  </target>
1587 1598
	
1588 1599
	<!-- This target will use default values in svn metacat.properties to build a configured 
1589 1600
		metacat (except configuti.* properties, they will be set true). Those default settings
......
1597 1608
         sibling of the current build directory. Requires maven2 to
1598 1609
         be installed and on the path. -->
1599 1610
    <target name="dataone-service" if="d1.available">
1600
        <property name="d1.jar" value="dataone-service-api-0.3.0.jar"/>
1601

  
1611
        <property name="d1.jar" value="d1_common_java-0.5.0.jar"/>
1602 1612
        <artifact:mvn pom="${d1.dir}/pom.xml" fork="true"
1603 1613
                      mavenHome="${maven.home}">
1604 1614
            <arg value="install"/>
1605 1615
        </artifact:mvn>
1606 1616
		<copy file="${d1.dir}/target/${d1.jar}" todir="${lib.dir}" />
1607
    </target>
1617
  </target>
1608 1618
</project>

Also available in: Unified diff