Project

General

Profile

« Previous | Next » 

Revision 5829

geoserver upgrade:
-remove embedded geoserver
-include geotools api and update spatial harvesting
-include simple template for using maps in skin (openlayers now, not mapbuilder)

View differences:

build.xml
124 124
			<fileset dir="lib/spatial/geoserver/WEB-INF/lib">
125 125
				<include name="*.jar" />
126 126
			</fileset>
127
			<pathelement
128
				location="lib/spatial/geoserver/WEB-INF/classes" />
129 127

  
130 128
			<!-- Include OAI-PMH -->
131 129
			<fileset dir="lib/oaipmh">
......
152 150
			<fileset dir="lib/spatial/geoserver/WEB-INF/lib">
153 151
				<include name="*.jar" />
154 152
			</fileset>
155
			<pathelement
156
				location="lib/spatial/geoserver/WEB-INF/classes" />
153
		
157 154

  
158 155
			<!-- Include OAI-PMH -->
159 156
			<fileset dir="lib/oaipmh">
......
757 754
			</fileset>
758 755
		</copy>
759 756

  
760
		<!-- Copy everything in geoservers WEB-INF (except the libs) into ${war.webinf} -->
761
		<copy todir="${war.webinf}" filtering="no">
762
			<fileset dir="${spatial.geoserver.dir}/WEB-INF">
763
				<exclude name="lib/**" />
764
				<exclude name="web.xml" />
765
			</fileset>
766
		</copy>
767

  
768
		<!-- Copy the rest of the geoserver codebase into ${war.context} -->
769
		<copy todir="${war.context}" filtering="no">
770
			<fileset dir="${spatial.geoserver.dir}">
771
				<exclude name="WEB-INF/**" />
772
				<exclude name="index.jsp" />
773
			</fileset>
774
		</copy>
775

  
776
		<!-- Copy the geoserver index.jsp but rename it to avoid conflicting w/metcat   -->
777
		<copy file="${spatial.geoserver.dir}/WEB-INF/pages/index.jsp"
778
			tofile="${war.context}/geoserver.jsp" overwrite="true"
779
			filtering="no" />
780

  
781
		<!-- Copy the rest of the modified geoserver web-inf files
782
			<copy todir="${war.webinf}" filtering="no">
783
			<fileset dir="${spatial.webinf-mods}">
784
			<exclude name="web.xml.combined"/>
785
			</fileset>
786
			</copy> -->
787

  
788 757
	</target>
789 758

  
790 759
	<target name="install" depends="build-metacat"

Also available in: Unified diff