Project

General

Profile

« Previous | Next » 

Revision 7622

use maven to manage most jar dependencies in Metacat.
Exceptions include: LSID, Datamamager (EML),

View differences:

build.xml
100 100
			value="${build.tomcat.dir}/lib/servlet-api.jar" />
101 101
	</target>
102 102
	
103
	<target name="init" depends="config">
104
		<path id="compile.classpath">
103
	<target name="init" depends="config" unless="init.called">
104
		
105
		<path id="base.classpath">
105 106
			<pathelement location="${jsdk}" />
106
            <fileset dir='lib/lucene'>
107
                <include name='*.jar'/>
108
            </fileset>
109
            <fileset dir='lib/solr'>
110
                <include name='*.jar'/>
111
            </fileset>
112

  
113 107
            <pathelement location="lib" />
108
			
114 109
			<fileset dir="lib">
115 110
				<include name="*.jar" />
116 111
			</fileset>
117
			<fileset dir="lib">
118
				<include name="xalan.jar" />
119
			</fileset>
112
			
120 113
			<fileset dir="lib/lsid_lib">
121 114
				<include name="*.jar" />
122 115
			</fileset>
123 116

  
124
			<!-- Include geoserver, geotools, et. al. -->
125
			<fileset dir="lib/spatial/geoserver/WEB-INF/lib">
117
			<!-- Include everything from maven -->
118
			<fileset dir="lib/maven">
126 119
				<include name="*.jar" />
127 120
			</fileset>
128 121

  
129
			<!-- Include OAI-PMH -->
130
			<fileset dir="lib/oaipmh">
131
				<include name="*.jar" />
132
			</fileset>
133

  
134 122
		</path>
135 123
		
136 124
		<path id="test.classpath">
......
140 128
				<include name="*.jar" />
141 129
				<exclude name="maven-ant-tasks-2.1.0.jar" />
142 130
			</fileset>
143
			<fileset dir="lib">
144
				<include name="xalan.jar" />
145
			</fileset>
146 131
			<fileset dir="lib/lsid_lib">
147 132
				<include name="*.jar" />
148 133
			</fileset>
149

  
150
			<!-- Include geoserver, geotools, et. al. -->
151
			<fileset dir="lib/spatial/geoserver/WEB-INF/lib">
134
			<!-- Include maven -->
135
			<fileset dir="lib/maven">
152 136
				<include name="*.jar" />
153 137
			</fileset>
138
		</path>
154 139
		
140
		<!-- define the maven tasks -->
141
		<taskdef uri="antlib:org.apache.maven.artifact.ant"
142
			       resource="org/apache/maven/artifact/ant/antlib.xml"
143
			       classpathref="base.classpath" />
155 144

  
156
			<!-- Include OAI-PMH -->
157
			<fileset dir="lib/oaipmh">
158
				<include name="*.jar" />
159
			</fileset>
160

  
145
	   	<!-- Resolve maven dependencies -->
146
		<artifact:pom id="metacatPom" file="pom.xml" />
147
		<artifact:dependencies filesetId="dependency.fileset" pomrefid="metacatPom" usescope="runtime"/>
148
		<artifact:dependencies pathId="dependency.classpath" pomrefid="metacatPom"/>
149
	   	
150
	    <property name="libdir.mvn" value="lib/maven" />
151
	   	
152
	   	<!-- combine base and dependencies for the classpath -->
153
	   	<path id="compile.classpath">
154
	   		<path refid="base.classpath" />	
155
	   		<path refid="dependency.classpath" />	
161 156
		</path>
162 157

  
163 158
		<!-- It is less likely you'll need to make any changes from here down,
......
416 411
				</not>
417 412
			</or>
418 413
		</condition>
414
		
415
		<property name="init.called" value="true" />
419 416

  
420 417
	</target>
418
	
419
	<target name="resolveDependencies" depends="init" description="retrieve dependencies with maven">
420
			<echo>Moving Maven dependencies (${dependency.fileset}) to ${libdir.mvn} </echo>
421
			<!-- Clear out mvn dir -->
422
			<delete dir="${libdir.mvn}"></delete>
423
			<!-- Copy all dependencies to the correct location. -->
424
			<copy todir="${libdir.mvn}">
425
				<fileset refid="dependency.fileset" />
426
				<!-- This mapper strips off all leading directory information -->
427
				<mapper type="flatten" />
428
			</copy>
429
		</target>
421 430

  
422
	<target name="prepare" depends="init">
431
	<target name="prepare" depends="init, resolveDependencies">
423 432
		<mkdir dir="${build.dir}" />
424 433
		<mkdir dir="${build.src}" />
425 434
		<mkdir dir="${build.dest}" />
......
748 757

  
749 758
	<target name="install-spatial" depends="jar,clientjar,harvesterjar"
750 759
		description="Installs spatial option for metacat">
751

  
752
		<property name="spatial.dir" value="./lib/spatial" />
753
		<property name="spatial.geoserver.dir"
754
			value="${spatial.dir}/geoserver" />
755
		<property name="spatial.webinf-mods"
756
			value="${spatial.dir}/WEB-INF" />
757

  
758
		<!-- Copy geoserver libs into ${war.lib} -->
759
		<copy todir="${war.lib}" filtering="no">
760
			<fileset dir="${spatial.geoserver.dir}/WEB-INF/lib">
761
				<include name="**" />
762
			</fileset>
763
		</copy>
764 760
		
765 761
		<copy todir="${dist.dir}">
766 762
			<fileset dir="./lib/spatial/geoserver" includes="*.war" />
......
936 932
		<copy file="${build.dir}/harvester.jar" todir="${war.lib}" />
937 933
		<copy todir="${war.lib}" filtering="no">
938 934
			<fileset dir="lib">
939
				<!--
940
					<not>
941
					<filename name="${jdbc-jar-name}"/>
942
					</not>
943
				-->
944 935
				<include name="*.jar" />
945 936
				<exclude name="maven-ant-tasks*.jar" />
946 937
			</fileset>
947
			<fileset dir="lib">
948
				<include name="xalan.jar" />
949
				<include name="gwt*.jar" />
950
			</fileset>
951
			<fileset dir="lib/oaipmh">
952
				<include name="oaicat.jar" />
953
			</fileset>
954
			<fileset dir="lib/solr">
955
			          <include name="*.jar" />
956
			</fileset>
957
			<fileset dir="lib/lucene">
958
			          <include name="*.jar" />
959
			</fileset>
938
			<fileset dir="lib/maven" />			
960 939
		</copy>
961 940
		<!-- MCD copy file="lib/web.xml.${tomcatversion}"
962 941
			tofile="${build.war}/web.xml" / -->

Also available in: Unified diff