checked out master at geoserver and xforms