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