From 3977bc72f212b5e238b83d5c91a934a7d935b286 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Mon, 29 Oct 2018 23:58:54 +0000 Subject: [PATCH 1/2] Move samples under resources --- ome-xml/src/main/cpp/ome/xml/CMakeLists.txt | 4 ++-- ome-xml/src/test/cpp/model.cpp | 2 +- ome-xml/src/test/cpp/transform.cpp | 2 +- .../resources}/samples/2008-09/dataset-group-project.ome.xml | 0 .../main/resources}/samples/2008-09/instrument.ome.xml | 0 .../samples/2008-09/multi-channel-time-series.ome.xml | 0 .../2008-09/multi-channel-z-series-time-series.ome.xml | 0 .../resources}/samples/2008-09/multi-channel-z-series.ome.xml | 0 .../main/resources}/samples/2008-09/multi-channel.ome.xml | 0 .../resources}/samples/2008-09/multi-pixel-aquired.ome.xml | 0 .../resources}/samples/2008-09/multi-pixel-default.ome.xml | 0 .../main/resources}/samples/2008-09/single-image.ome.xml | 0 .../main/resources}/samples/2008-09/time-series.ome.xml | 0 .../resources}/samples/2008-09/z-series-time-series.ome.xml | 0 .../{ => src/main/resources}/samples/2008-09/z-series.ome.xml | 0 .../{ => src/main/resources}/samples/2009-09/ROI.ome.xml | 0 .../main/resources}/samples/2009-09/instrument.ome.xml | 0 .../main/resources}/samples/2009-09/metadata-only.ome.xml | 0 .../samples/2009-09/multi-channel-time-series.ome.xml | 0 .../2009-09/multi-channel-z-series-time-series.ome.xml | 0 .../resources}/samples/2009-09/multi-channel-z-series.ome.xml | 0 .../main/resources}/samples/2009-09/multi-channel.ome.xml | 0 .../samples/2009-09/one-screen-one-plate-four-wells.ome.xml | 0 .../main/resources}/samples/2009-09/single-image.ome.xml | 0 .../main/resources}/samples/2009-09/time-series.ome.xml | 0 .../samples/2009-09/two-screens-two-plates-four-wells.ome.xml | 0 .../resources}/samples/2009-09/z-series-time-series.ome.xml | 0 .../{ => src/main/resources}/samples/2009-09/z-series.ome.xml | 0 .../{ => src/main/resources}/samples/2010-04/ROI.ome.xml | 0 .../{ => src/main/resources}/samples/2010-04/filter.ome.xml | 0 .../main/resources}/samples/2010-04/instrument.ome.xml | 0 .../main/resources}/samples/2010-04/metadata-only.ome.xml | 0 .../samples/2010-04/multi-channel-time-series.ome.xml | 0 .../2010-04/multi-channel-z-series-time-series.ome.xml | 0 .../resources}/samples/2010-04/multi-channel-z-series.ome.xml | 0 .../main/resources}/samples/2010-04/multi-channel.ome.xml | 0 .../samples/2010-04/one-screen-one-plate-four-wells.ome.xml | 0 .../main/resources}/samples/2010-04/single-image.ome.xml | 0 .../main/resources}/samples/2010-04/time-series.ome.xml | 0 .../samples/2010-04/two-screens-two-plates-four-wells.ome.xml | 0 .../resources}/samples/2010-04/z-series-time-series.ome.xml | 0 .../{ => src/main/resources}/samples/2010-04/z-series.ome.xml | 0 .../{ => src/main/resources}/samples/2010-06/ROI.ome.xml | 0 .../{ => src/main/resources}/samples/2010-06/filter.ome.xml | 0 .../main/resources}/samples/2010-06/instrument.ome.xml | 0 .../main/resources}/samples/2010-06/metadata-only.ome.xml | 0 .../samples/2010-06/multi-channel-time-series.ome.xml | 0 .../2010-06/multi-channel-z-series-time-series.ome.xml | 0 .../resources}/samples/2010-06/multi-channel-z-series.ome.xml | 0 .../main/resources}/samples/2010-06/multi-channel.ome.xml | 0 .../{ => src/main/resources}/samples/2010-06/no-date.ome.xml | 0 .../samples/2010-06/one-screen-one-plate-four-wells.ome.xml | 0 .../main/resources}/samples/2010-06/single-image.ome.xml | 0 .../{ => src/main/resources}/samples/2010-06/spim.ome.xml | 0 .../main/resources}/samples/2010-06/time-series.ome.xml | 0 .../samples/2010-06/two-screens-two-plates-four-wells.ome.xml | 0 .../main/resources}/samples/2010-06/xmlannotation-svg.ome.xml | 0 .../resources}/samples/2010-06/z-series-time-series.ome.xml | 0 .../{ => src/main/resources}/samples/2010-06/z-series.ome.xml | 0 .../{ => src/main/resources}/samples/2011-06/ROI.ome.xml | 0 .../{ => src/main/resources}/samples/2011-06/filter.ome.xml | 0 .../main/resources}/samples/2011-06/instrument.ome.xml | 0 .../main/resources}/samples/2011-06/metadata-only.ome.xml | 0 .../samples/2011-06/multi-channel-time-series.ome.xml | 0 .../2011-06/multi-channel-z-series-time-series.ome.xml | 0 .../resources}/samples/2011-06/multi-channel-z-series.ome.xml | 0 .../main/resources}/samples/2011-06/multi-channel.ome.xml | 0 .../{ => src/main/resources}/samples/2011-06/no-date.ome.xml | 0 .../samples/2011-06/one-screen-one-plate-four-wells.ome.xml | 0 .../main/resources}/samples/2011-06/single-image.ome.xml | 0 .../{ => src/main/resources}/samples/2011-06/spim.ome.xml | 0 .../main/resources}/samples/2011-06/time-series.ome.xml | 0 .../samples/2011-06/transformations-upgrade.ome.xml | 0 .../samples/2011-06/two-screens-two-plates-four-wells.ome.xml | 0 .../main/resources}/samples/2011-06/xmlannotation-svg.ome.xml | 0 .../resources}/samples/2011-06/z-series-time-series.ome.xml | 0 .../{ => src/main/resources}/samples/2011-06/z-series.ome.xml | 0 .../{ => src/main/resources}/samples/2012-06/ROI.ome.xml | 0 .../{ => src/main/resources}/samples/2012-06/filter.ome.xml | 0 .../main/resources}/samples/2012-06/instrument.ome.xml | 0 .../main/resources}/samples/2012-06/metadata-only.ome.xml | 0 .../samples/2012-06/multi-channel-time-series.ome.xml | 0 .../2012-06/multi-channel-z-series-time-series.ome.xml | 0 .../resources}/samples/2012-06/multi-channel-z-series.ome.xml | 0 .../main/resources}/samples/2012-06/multi-channel.ome.xml | 0 .../{ => src/main/resources}/samples/2012-06/no-date.ome.xml | 0 .../samples/2012-06/one-screen-one-plate-four-wells.ome.xml | 0 .../main/resources}/samples/2012-06/single-image.ome.xml | 0 .../{ => src/main/resources}/samples/2012-06/spim.ome.xml | 0 .../main/resources}/samples/2012-06/tagannotation.ome.xml | 0 .../main/resources}/samples/2012-06/time-series.ome.xml | 0 .../samples/2012-06/transformations-downgrade.ome.xml | 0 .../samples/2012-06/transformations-upgrade.ome.xml | 0 .../samples/2012-06/two-screens-two-plates-four-wells.ome.xml | 0 .../main/resources}/samples/2012-06/xmlannotation-svg.ome.xml | 0 .../resources}/samples/2012-06/z-series-time-series.ome.xml | 0 .../{ => src/main/resources}/samples/2012-06/z-series.ome.xml | 0 .../{ => src/main/resources}/samples/2013-06/ROI.ome.xml | 0 .../main/resources}/samples/2013-06/commentannotation.ome.xml | 0 .../{ => src/main/resources}/samples/2013-06/filter.ome.xml | 0 .../main/resources}/samples/2013-06/instrument.ome.xml | 0 .../main/resources}/samples/2013-06/metadata-only.ome.xml | 0 .../samples/2013-06/multi-channel-time-series.ome.xml | 0 .../2013-06/multi-channel-z-series-time-series.ome.xml | 0 .../resources}/samples/2013-06/multi-channel-z-series.ome.xml | 0 .../main/resources}/samples/2013-06/multi-channel.ome.xml | 0 .../{ => src/main/resources}/samples/2013-06/no-date.ome.xml | 0 .../samples/2013-06/one-screen-one-plate-four-wells.ome.xml | 0 .../main/resources}/samples/2013-06/single-image.ome.xml | 0 .../{ => src/main/resources}/samples/2013-06/spim.ome.xml | 0 .../main/resources}/samples/2013-06/tagannotation.ome.xml | 0 .../main/resources}/samples/2013-06/time-series.ome.xml | 0 .../samples/2013-06/timestampannotation-posix-only.ome.xml | 0 .../resources}/samples/2013-06/timestampannotation.ome.xml | 0 .../samples/2013-06/transformations-downgrade.ome.xml | 0 .../samples/2013-06/transformations-upgrade.ome.xml | 0 .../samples/2013-06/two-screens-two-plates-four-wells.ome.xml | 0 .../samples/2013-06/xmlannotation-body-space.ome.xml | 0 .../samples/2013-06/xmlannotation-multi-value.ome.xml | 0 .../main/resources}/samples/2013-06/xmlannotation-svg.ome.xml | 0 .../resources}/samples/2013-06/z-series-time-series.ome.xml | 0 .../{ => src/main/resources}/samples/2013-06/z-series.ome.xml | 0 .../{ => src/main/resources}/samples/2015-01/ROI.ome.xml | 0 .../main/resources}/samples/2015-01/commentannotation.ome.xml | 0 .../{ => src/main/resources}/samples/2015-01/filter.ome.xml | 0 .../{ => src/main/resources}/samples/2015-01/hcs.ome.xml | 0 .../samples/2015-01/instrument-units-alternate.ome.xml | 0 .../samples/2015-01/instrument-units-default.ome.xml | 0 .../main/resources}/samples/2015-01/instrument.ome.xml | 0 .../main/resources}/samples/2015-01/mapannotation.ome.xml | 0 .../main/resources}/samples/2015-01/metadata-only.ome.xml | 0 .../resources}/samples/2015-01/minimum-specification.ome.xml | 0 .../samples/2015-01/multi-channel-time-series.ome.xml | 0 .../2015-01/multi-channel-z-series-time-series.ome.xml | 0 .../resources}/samples/2015-01/multi-channel-z-series.ome.xml | 0 .../main/resources}/samples/2015-01/multi-channel.ome.xml | 0 .../{ => src/main/resources}/samples/2015-01/no-date.ome.xml | 0 .../samples/2015-01/one-screen-one-plate-four-wells.ome.xml | 0 .../main/resources}/samples/2015-01/single-image.ome.xml | 0 .../{ => src/main/resources}/samples/2015-01/spim.ome.xml | 0 .../main/resources}/samples/2015-01/tagannotation.ome.xml | 0 .../main/resources}/samples/2015-01/time-series.ome.xml | 0 .../samples/2015-01/timestampannotation-posix-only.ome.xml | 0 .../resources}/samples/2015-01/timestampannotation.ome.xml | 0 .../samples/2015-01/transformations-downgrade.ome.xml | 0 .../samples/2015-01/transformations-upgrade.ome.xml | 0 .../samples/2015-01/two-screens-two-plates-four-wells.ome.xml | 0 .../samples/2015-01/xmlannotation-body-space.ome.xml | 0 .../samples/2015-01/xmlannotation-multi-value.ome.xml | 0 .../main/resources}/samples/2015-01/xmlannotation-svg.ome.xml | 0 .../resources}/samples/2015-01/z-series-time-series.ome.xml | 0 .../{ => src/main/resources}/samples/2015-01/z-series.ome.xml | 0 .../{ => src/main/resources}/samples/2016-06/ROI.ome.xml | 0 .../main/resources}/samples/2016-06/commentannotation.ome.xml | 0 .../{ => src/main/resources}/samples/2016-06/filter.ome.xml | 0 .../samples/2016-06/folders-larger-taxonomy.ome.xml | 0 .../samples/2016-06/folders-simple-taxonomy.ome.xml | 0 .../{ => src/main/resources}/samples/2016-06/hcs.ome.xml | 0 .../samples/2016-06/instrument-units-alternate.ome.xml | 0 .../samples/2016-06/instrument-units-default.ome.xml | 0 .../main/resources}/samples/2016-06/instrument.ome.xml | 0 .../main/resources}/samples/2016-06/mapannotation.ome.xml | 0 .../main/resources}/samples/2016-06/metadata-only.ome.xml | 0 .../resources}/samples/2016-06/minimum-specification.ome.xml | 0 .../samples/2016-06/multi-channel-time-series.ome.xml | 0 .../2016-06/multi-channel-z-series-time-series.ome.xml | 0 .../resources}/samples/2016-06/multi-channel-z-series.ome.xml | 0 .../main/resources}/samples/2016-06/multi-channel.ome.xml | 0 .../{ => src/main/resources}/samples/2016-06/no-date.ome.xml | 0 .../samples/2016-06/one-screen-one-plate-four-wells.ome.xml | 0 .../main/resources}/samples/2016-06/single-image.ome.xml | 0 .../{ => src/main/resources}/samples/2016-06/spim.ome.xml | 0 .../main/resources}/samples/2016-06/tagannotation.ome.xml | 0 .../main/resources}/samples/2016-06/time-series.ome.xml | 0 .../samples/2016-06/timestampannotation-posix-only.ome.xml | 0 .../resources}/samples/2016-06/timestampannotation.ome.xml | 0 .../samples/2016-06/transformations-downgrade.ome.xml | 0 .../samples/2016-06/transformations-upgrade.ome.xml | 0 .../samples/2016-06/two-screens-two-plates-four-wells.ome.xml | 0 .../samples/2016-06/xmlannotation-body-space.ome.xml | 0 .../samples/2016-06/xmlannotation-multi-value.ome.xml | 0 .../main/resources}/samples/2016-06/xmlannotation-svg.ome.xml | 0 .../resources}/samples/2016-06/z-series-time-series.ome.xml | 0 .../{ => src/main/resources}/samples/2016-06/z-series.ome.xml | 0 184 files changed, 4 insertions(+), 4 deletions(-) rename specification/{ => src/main/resources}/samples/2008-09/dataset-group-project.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2008-09/instrument.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2008-09/multi-channel-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2008-09/multi-channel-z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2008-09/multi-channel-z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2008-09/multi-channel.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2008-09/multi-pixel-aquired.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2008-09/multi-pixel-default.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2008-09/single-image.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2008-09/time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2008-09/z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2008-09/z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2009-09/ROI.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2009-09/instrument.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2009-09/metadata-only.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2009-09/multi-channel-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2009-09/multi-channel-z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2009-09/multi-channel-z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2009-09/multi-channel.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2009-09/one-screen-one-plate-four-wells.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2009-09/single-image.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2009-09/time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2009-09/two-screens-two-plates-four-wells.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2009-09/z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2009-09/z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-04/ROI.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-04/filter.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-04/instrument.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-04/metadata-only.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-04/multi-channel-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-04/multi-channel-z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-04/multi-channel-z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-04/multi-channel.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-04/one-screen-one-plate-four-wells.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-04/single-image.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-04/time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-04/two-screens-two-plates-four-wells.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-04/z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-04/z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/ROI.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/filter.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/instrument.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/metadata-only.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/multi-channel-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/multi-channel-z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/multi-channel-z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/multi-channel.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/no-date.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/one-screen-one-plate-four-wells.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/single-image.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/spim.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/two-screens-two-plates-four-wells.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/xmlannotation-svg.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2010-06/z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/ROI.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/filter.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/instrument.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/metadata-only.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/multi-channel-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/multi-channel-z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/multi-channel-z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/multi-channel.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/no-date.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/one-screen-one-plate-four-wells.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/single-image.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/spim.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/transformations-upgrade.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/two-screens-two-plates-four-wells.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/xmlannotation-svg.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2011-06/z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/ROI.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/filter.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/instrument.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/metadata-only.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/multi-channel-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/multi-channel-z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/multi-channel-z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/multi-channel.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/no-date.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/one-screen-one-plate-four-wells.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/single-image.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/spim.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/tagannotation.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/transformations-downgrade.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/transformations-upgrade.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/two-screens-two-plates-four-wells.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/xmlannotation-svg.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2012-06/z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/ROI.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/commentannotation.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/filter.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/instrument.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/metadata-only.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/multi-channel-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/multi-channel-z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/multi-channel-z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/multi-channel.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/no-date.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/one-screen-one-plate-four-wells.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/single-image.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/spim.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/tagannotation.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/timestampannotation-posix-only.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/timestampannotation.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/transformations-downgrade.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/transformations-upgrade.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/two-screens-two-plates-four-wells.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/xmlannotation-body-space.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/xmlannotation-multi-value.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/xmlannotation-svg.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2013-06/z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/ROI.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/commentannotation.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/filter.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/hcs.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/instrument-units-alternate.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/instrument-units-default.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/instrument.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/mapannotation.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/metadata-only.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/minimum-specification.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/multi-channel-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/multi-channel-z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/multi-channel-z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/multi-channel.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/no-date.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/one-screen-one-plate-four-wells.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/single-image.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/spim.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/tagannotation.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/timestampannotation-posix-only.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/timestampannotation.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/transformations-downgrade.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/transformations-upgrade.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/two-screens-two-plates-four-wells.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/xmlannotation-body-space.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/xmlannotation-multi-value.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/xmlannotation-svg.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2015-01/z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/ROI.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/commentannotation.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/filter.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/folders-larger-taxonomy.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/folders-simple-taxonomy.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/hcs.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/instrument-units-alternate.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/instrument-units-default.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/instrument.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/mapannotation.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/metadata-only.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/minimum-specification.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/multi-channel-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/multi-channel-z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/multi-channel-z-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/multi-channel.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/no-date.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/one-screen-one-plate-four-wells.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/single-image.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/spim.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/tagannotation.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/timestampannotation-posix-only.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/timestampannotation.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/transformations-downgrade.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/transformations-upgrade.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/two-screens-two-plates-four-wells.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/xmlannotation-body-space.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/xmlannotation-multi-value.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/xmlannotation-svg.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/z-series-time-series.ome.xml (100%) rename specification/{ => src/main/resources}/samples/2016-06/z-series.ome.xml (100%) diff --git a/ome-xml/src/main/cpp/ome/xml/CMakeLists.txt b/ome-xml/src/main/cpp/ome/xml/CMakeLists.txt index 5db0dd1a0..261889f3c 100644 --- a/ome-xml/src/main/cpp/ome/xml/CMakeLists.txt +++ b/ome-xml/src/main/cpp/ome/xml/CMakeLists.txt @@ -263,10 +263,10 @@ foreach(transform ${OME_TRANSFORMS}) endforeach(transform) # Find and install all samples -file(GLOB_RECURSE OME_SAMPLES RELATIVE "${PROJECT_SOURCE_DIR}/specification/samples/" "${PROJECT_SOURCE_DIR}/specification/samples/*") +file(GLOB_RECURSE OME_SAMPLES RELATIVE "${PROJECT_SOURCE_DIR}/specification/src/main/resources/samples/" "${PROJECT_SOURCE_DIR}/specification/src/main/resources/samples/*") foreach(sample ${OME_SAMPLES}) get_filename_component(SAMPLE_FILE ${sample} PATH) - install(FILES "${PROJECT_SOURCE_DIR}/specification/samples/${sample}" + install(FILES "${PROJECT_SOURCE_DIR}/specification/src/main/resources/samples/${sample}" DESTINATION "${OME_XML_INSTALL_SAMPLEDIR}/${SAMPLE_FILE}" COMPONENT "runtime") endforeach(sample) diff --git a/ome-xml/src/test/cpp/model.cpp b/ome-xml/src/test/cpp/model.cpp index 75a2cf497..7662e1075 100644 --- a/ome-xml/src/test/cpp/model.cpp +++ b/ome-xml/src/test/cpp/model.cpp @@ -83,7 +83,7 @@ namespace /// @todo Use the correct model version when available. /// @todo Use all model versions when transforms available. - path dir(PROJECT_SOURCE_DIR "/specification/samples/" "2015-01"); + path dir(PROJECT_SOURCE_DIR "/specification/src/main/resources/samples/" "2015-01"); if (exists(dir) && is_directory(dir)) { for(directory_iterator i(dir); i != directory_iterator(); ++i) diff --git a/ome-xml/src/test/cpp/transform.cpp b/ome-xml/src/test/cpp/transform.cpp index 42d82a173..7c7660f3f 100644 --- a/ome-xml/src/test/cpp/transform.cpp +++ b/ome-xml/src/test/cpp/transform.cpp @@ -80,7 +80,7 @@ namespace ome::xml::OMETransformResolver tr; std::set versions = tr.schema_versions(); - path samplesdir(PROJECT_SOURCE_DIR "/specification/samples"); + path samplesdir(PROJECT_SOURCE_DIR "/specification/src/main/resources/samples"); if (exists(samplesdir) && is_directory(samplesdir)) { for (directory_iterator si(samplesdir); si != directory_iterator(); ++si) diff --git a/specification/samples/2008-09/dataset-group-project.ome.xml b/specification/src/main/resources/samples/2008-09/dataset-group-project.ome.xml similarity index 100% rename from specification/samples/2008-09/dataset-group-project.ome.xml rename to specification/src/main/resources/samples/2008-09/dataset-group-project.ome.xml diff --git a/specification/samples/2008-09/instrument.ome.xml b/specification/src/main/resources/samples/2008-09/instrument.ome.xml similarity index 100% rename from specification/samples/2008-09/instrument.ome.xml rename to specification/src/main/resources/samples/2008-09/instrument.ome.xml diff --git a/specification/samples/2008-09/multi-channel-time-series.ome.xml b/specification/src/main/resources/samples/2008-09/multi-channel-time-series.ome.xml similarity index 100% rename from specification/samples/2008-09/multi-channel-time-series.ome.xml rename to specification/src/main/resources/samples/2008-09/multi-channel-time-series.ome.xml diff --git a/specification/samples/2008-09/multi-channel-z-series-time-series.ome.xml b/specification/src/main/resources/samples/2008-09/multi-channel-z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2008-09/multi-channel-z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2008-09/multi-channel-z-series-time-series.ome.xml diff --git a/specification/samples/2008-09/multi-channel-z-series.ome.xml b/specification/src/main/resources/samples/2008-09/multi-channel-z-series.ome.xml similarity index 100% rename from specification/samples/2008-09/multi-channel-z-series.ome.xml rename to specification/src/main/resources/samples/2008-09/multi-channel-z-series.ome.xml diff --git a/specification/samples/2008-09/multi-channel.ome.xml b/specification/src/main/resources/samples/2008-09/multi-channel.ome.xml similarity index 100% rename from specification/samples/2008-09/multi-channel.ome.xml rename to specification/src/main/resources/samples/2008-09/multi-channel.ome.xml diff --git a/specification/samples/2008-09/multi-pixel-aquired.ome.xml b/specification/src/main/resources/samples/2008-09/multi-pixel-aquired.ome.xml similarity index 100% rename from specification/samples/2008-09/multi-pixel-aquired.ome.xml rename to specification/src/main/resources/samples/2008-09/multi-pixel-aquired.ome.xml diff --git a/specification/samples/2008-09/multi-pixel-default.ome.xml b/specification/src/main/resources/samples/2008-09/multi-pixel-default.ome.xml similarity index 100% rename from specification/samples/2008-09/multi-pixel-default.ome.xml rename to specification/src/main/resources/samples/2008-09/multi-pixel-default.ome.xml diff --git a/specification/samples/2008-09/single-image.ome.xml b/specification/src/main/resources/samples/2008-09/single-image.ome.xml similarity index 100% rename from specification/samples/2008-09/single-image.ome.xml rename to specification/src/main/resources/samples/2008-09/single-image.ome.xml diff --git a/specification/samples/2008-09/time-series.ome.xml b/specification/src/main/resources/samples/2008-09/time-series.ome.xml similarity index 100% rename from specification/samples/2008-09/time-series.ome.xml rename to specification/src/main/resources/samples/2008-09/time-series.ome.xml diff --git a/specification/samples/2008-09/z-series-time-series.ome.xml b/specification/src/main/resources/samples/2008-09/z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2008-09/z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2008-09/z-series-time-series.ome.xml diff --git a/specification/samples/2008-09/z-series.ome.xml b/specification/src/main/resources/samples/2008-09/z-series.ome.xml similarity index 100% rename from specification/samples/2008-09/z-series.ome.xml rename to specification/src/main/resources/samples/2008-09/z-series.ome.xml diff --git a/specification/samples/2009-09/ROI.ome.xml b/specification/src/main/resources/samples/2009-09/ROI.ome.xml similarity index 100% rename from specification/samples/2009-09/ROI.ome.xml rename to specification/src/main/resources/samples/2009-09/ROI.ome.xml diff --git a/specification/samples/2009-09/instrument.ome.xml b/specification/src/main/resources/samples/2009-09/instrument.ome.xml similarity index 100% rename from specification/samples/2009-09/instrument.ome.xml rename to specification/src/main/resources/samples/2009-09/instrument.ome.xml diff --git a/specification/samples/2009-09/metadata-only.ome.xml b/specification/src/main/resources/samples/2009-09/metadata-only.ome.xml similarity index 100% rename from specification/samples/2009-09/metadata-only.ome.xml rename to specification/src/main/resources/samples/2009-09/metadata-only.ome.xml diff --git a/specification/samples/2009-09/multi-channel-time-series.ome.xml b/specification/src/main/resources/samples/2009-09/multi-channel-time-series.ome.xml similarity index 100% rename from specification/samples/2009-09/multi-channel-time-series.ome.xml rename to specification/src/main/resources/samples/2009-09/multi-channel-time-series.ome.xml diff --git a/specification/samples/2009-09/multi-channel-z-series-time-series.ome.xml b/specification/src/main/resources/samples/2009-09/multi-channel-z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2009-09/multi-channel-z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2009-09/multi-channel-z-series-time-series.ome.xml diff --git a/specification/samples/2009-09/multi-channel-z-series.ome.xml b/specification/src/main/resources/samples/2009-09/multi-channel-z-series.ome.xml similarity index 100% rename from specification/samples/2009-09/multi-channel-z-series.ome.xml rename to specification/src/main/resources/samples/2009-09/multi-channel-z-series.ome.xml diff --git a/specification/samples/2009-09/multi-channel.ome.xml b/specification/src/main/resources/samples/2009-09/multi-channel.ome.xml similarity index 100% rename from specification/samples/2009-09/multi-channel.ome.xml rename to specification/src/main/resources/samples/2009-09/multi-channel.ome.xml diff --git a/specification/samples/2009-09/one-screen-one-plate-four-wells.ome.xml b/specification/src/main/resources/samples/2009-09/one-screen-one-plate-four-wells.ome.xml similarity index 100% rename from specification/samples/2009-09/one-screen-one-plate-four-wells.ome.xml rename to specification/src/main/resources/samples/2009-09/one-screen-one-plate-four-wells.ome.xml diff --git a/specification/samples/2009-09/single-image.ome.xml b/specification/src/main/resources/samples/2009-09/single-image.ome.xml similarity index 100% rename from specification/samples/2009-09/single-image.ome.xml rename to specification/src/main/resources/samples/2009-09/single-image.ome.xml diff --git a/specification/samples/2009-09/time-series.ome.xml b/specification/src/main/resources/samples/2009-09/time-series.ome.xml similarity index 100% rename from specification/samples/2009-09/time-series.ome.xml rename to specification/src/main/resources/samples/2009-09/time-series.ome.xml diff --git a/specification/samples/2009-09/two-screens-two-plates-four-wells.ome.xml b/specification/src/main/resources/samples/2009-09/two-screens-two-plates-four-wells.ome.xml similarity index 100% rename from specification/samples/2009-09/two-screens-two-plates-four-wells.ome.xml rename to specification/src/main/resources/samples/2009-09/two-screens-two-plates-four-wells.ome.xml diff --git a/specification/samples/2009-09/z-series-time-series.ome.xml b/specification/src/main/resources/samples/2009-09/z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2009-09/z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2009-09/z-series-time-series.ome.xml diff --git a/specification/samples/2009-09/z-series.ome.xml b/specification/src/main/resources/samples/2009-09/z-series.ome.xml similarity index 100% rename from specification/samples/2009-09/z-series.ome.xml rename to specification/src/main/resources/samples/2009-09/z-series.ome.xml diff --git a/specification/samples/2010-04/ROI.ome.xml b/specification/src/main/resources/samples/2010-04/ROI.ome.xml similarity index 100% rename from specification/samples/2010-04/ROI.ome.xml rename to specification/src/main/resources/samples/2010-04/ROI.ome.xml diff --git a/specification/samples/2010-04/filter.ome.xml b/specification/src/main/resources/samples/2010-04/filter.ome.xml similarity index 100% rename from specification/samples/2010-04/filter.ome.xml rename to specification/src/main/resources/samples/2010-04/filter.ome.xml diff --git a/specification/samples/2010-04/instrument.ome.xml b/specification/src/main/resources/samples/2010-04/instrument.ome.xml similarity index 100% rename from specification/samples/2010-04/instrument.ome.xml rename to specification/src/main/resources/samples/2010-04/instrument.ome.xml diff --git a/specification/samples/2010-04/metadata-only.ome.xml b/specification/src/main/resources/samples/2010-04/metadata-only.ome.xml similarity index 100% rename from specification/samples/2010-04/metadata-only.ome.xml rename to specification/src/main/resources/samples/2010-04/metadata-only.ome.xml diff --git a/specification/samples/2010-04/multi-channel-time-series.ome.xml b/specification/src/main/resources/samples/2010-04/multi-channel-time-series.ome.xml similarity index 100% rename from specification/samples/2010-04/multi-channel-time-series.ome.xml rename to specification/src/main/resources/samples/2010-04/multi-channel-time-series.ome.xml diff --git a/specification/samples/2010-04/multi-channel-z-series-time-series.ome.xml b/specification/src/main/resources/samples/2010-04/multi-channel-z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2010-04/multi-channel-z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2010-04/multi-channel-z-series-time-series.ome.xml diff --git a/specification/samples/2010-04/multi-channel-z-series.ome.xml b/specification/src/main/resources/samples/2010-04/multi-channel-z-series.ome.xml similarity index 100% rename from specification/samples/2010-04/multi-channel-z-series.ome.xml rename to specification/src/main/resources/samples/2010-04/multi-channel-z-series.ome.xml diff --git a/specification/samples/2010-04/multi-channel.ome.xml b/specification/src/main/resources/samples/2010-04/multi-channel.ome.xml similarity index 100% rename from specification/samples/2010-04/multi-channel.ome.xml rename to specification/src/main/resources/samples/2010-04/multi-channel.ome.xml diff --git a/specification/samples/2010-04/one-screen-one-plate-four-wells.ome.xml b/specification/src/main/resources/samples/2010-04/one-screen-one-plate-four-wells.ome.xml similarity index 100% rename from specification/samples/2010-04/one-screen-one-plate-four-wells.ome.xml rename to specification/src/main/resources/samples/2010-04/one-screen-one-plate-four-wells.ome.xml diff --git a/specification/samples/2010-04/single-image.ome.xml b/specification/src/main/resources/samples/2010-04/single-image.ome.xml similarity index 100% rename from specification/samples/2010-04/single-image.ome.xml rename to specification/src/main/resources/samples/2010-04/single-image.ome.xml diff --git a/specification/samples/2010-04/time-series.ome.xml b/specification/src/main/resources/samples/2010-04/time-series.ome.xml similarity index 100% rename from specification/samples/2010-04/time-series.ome.xml rename to specification/src/main/resources/samples/2010-04/time-series.ome.xml diff --git a/specification/samples/2010-04/two-screens-two-plates-four-wells.ome.xml b/specification/src/main/resources/samples/2010-04/two-screens-two-plates-four-wells.ome.xml similarity index 100% rename from specification/samples/2010-04/two-screens-two-plates-four-wells.ome.xml rename to specification/src/main/resources/samples/2010-04/two-screens-two-plates-four-wells.ome.xml diff --git a/specification/samples/2010-04/z-series-time-series.ome.xml b/specification/src/main/resources/samples/2010-04/z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2010-04/z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2010-04/z-series-time-series.ome.xml diff --git a/specification/samples/2010-04/z-series.ome.xml b/specification/src/main/resources/samples/2010-04/z-series.ome.xml similarity index 100% rename from specification/samples/2010-04/z-series.ome.xml rename to specification/src/main/resources/samples/2010-04/z-series.ome.xml diff --git a/specification/samples/2010-06/ROI.ome.xml b/specification/src/main/resources/samples/2010-06/ROI.ome.xml similarity index 100% rename from specification/samples/2010-06/ROI.ome.xml rename to specification/src/main/resources/samples/2010-06/ROI.ome.xml diff --git a/specification/samples/2010-06/filter.ome.xml b/specification/src/main/resources/samples/2010-06/filter.ome.xml similarity index 100% rename from specification/samples/2010-06/filter.ome.xml rename to specification/src/main/resources/samples/2010-06/filter.ome.xml diff --git a/specification/samples/2010-06/instrument.ome.xml b/specification/src/main/resources/samples/2010-06/instrument.ome.xml similarity index 100% rename from specification/samples/2010-06/instrument.ome.xml rename to specification/src/main/resources/samples/2010-06/instrument.ome.xml diff --git a/specification/samples/2010-06/metadata-only.ome.xml b/specification/src/main/resources/samples/2010-06/metadata-only.ome.xml similarity index 100% rename from specification/samples/2010-06/metadata-only.ome.xml rename to specification/src/main/resources/samples/2010-06/metadata-only.ome.xml diff --git a/specification/samples/2010-06/multi-channel-time-series.ome.xml b/specification/src/main/resources/samples/2010-06/multi-channel-time-series.ome.xml similarity index 100% rename from specification/samples/2010-06/multi-channel-time-series.ome.xml rename to specification/src/main/resources/samples/2010-06/multi-channel-time-series.ome.xml diff --git a/specification/samples/2010-06/multi-channel-z-series-time-series.ome.xml b/specification/src/main/resources/samples/2010-06/multi-channel-z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2010-06/multi-channel-z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2010-06/multi-channel-z-series-time-series.ome.xml diff --git a/specification/samples/2010-06/multi-channel-z-series.ome.xml b/specification/src/main/resources/samples/2010-06/multi-channel-z-series.ome.xml similarity index 100% rename from specification/samples/2010-06/multi-channel-z-series.ome.xml rename to specification/src/main/resources/samples/2010-06/multi-channel-z-series.ome.xml diff --git a/specification/samples/2010-06/multi-channel.ome.xml b/specification/src/main/resources/samples/2010-06/multi-channel.ome.xml similarity index 100% rename from specification/samples/2010-06/multi-channel.ome.xml rename to specification/src/main/resources/samples/2010-06/multi-channel.ome.xml diff --git a/specification/samples/2010-06/no-date.ome.xml b/specification/src/main/resources/samples/2010-06/no-date.ome.xml similarity index 100% rename from specification/samples/2010-06/no-date.ome.xml rename to specification/src/main/resources/samples/2010-06/no-date.ome.xml diff --git a/specification/samples/2010-06/one-screen-one-plate-four-wells.ome.xml b/specification/src/main/resources/samples/2010-06/one-screen-one-plate-four-wells.ome.xml similarity index 100% rename from specification/samples/2010-06/one-screen-one-plate-four-wells.ome.xml rename to specification/src/main/resources/samples/2010-06/one-screen-one-plate-four-wells.ome.xml diff --git a/specification/samples/2010-06/single-image.ome.xml b/specification/src/main/resources/samples/2010-06/single-image.ome.xml similarity index 100% rename from specification/samples/2010-06/single-image.ome.xml rename to specification/src/main/resources/samples/2010-06/single-image.ome.xml diff --git a/specification/samples/2010-06/spim.ome.xml b/specification/src/main/resources/samples/2010-06/spim.ome.xml similarity index 100% rename from specification/samples/2010-06/spim.ome.xml rename to specification/src/main/resources/samples/2010-06/spim.ome.xml diff --git a/specification/samples/2010-06/time-series.ome.xml b/specification/src/main/resources/samples/2010-06/time-series.ome.xml similarity index 100% rename from specification/samples/2010-06/time-series.ome.xml rename to specification/src/main/resources/samples/2010-06/time-series.ome.xml diff --git a/specification/samples/2010-06/two-screens-two-plates-four-wells.ome.xml b/specification/src/main/resources/samples/2010-06/two-screens-two-plates-four-wells.ome.xml similarity index 100% rename from specification/samples/2010-06/two-screens-two-plates-four-wells.ome.xml rename to specification/src/main/resources/samples/2010-06/two-screens-two-plates-four-wells.ome.xml diff --git a/specification/samples/2010-06/xmlannotation-svg.ome.xml b/specification/src/main/resources/samples/2010-06/xmlannotation-svg.ome.xml similarity index 100% rename from specification/samples/2010-06/xmlannotation-svg.ome.xml rename to specification/src/main/resources/samples/2010-06/xmlannotation-svg.ome.xml diff --git a/specification/samples/2010-06/z-series-time-series.ome.xml b/specification/src/main/resources/samples/2010-06/z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2010-06/z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2010-06/z-series-time-series.ome.xml diff --git a/specification/samples/2010-06/z-series.ome.xml b/specification/src/main/resources/samples/2010-06/z-series.ome.xml similarity index 100% rename from specification/samples/2010-06/z-series.ome.xml rename to specification/src/main/resources/samples/2010-06/z-series.ome.xml diff --git a/specification/samples/2011-06/ROI.ome.xml b/specification/src/main/resources/samples/2011-06/ROI.ome.xml similarity index 100% rename from specification/samples/2011-06/ROI.ome.xml rename to specification/src/main/resources/samples/2011-06/ROI.ome.xml diff --git a/specification/samples/2011-06/filter.ome.xml b/specification/src/main/resources/samples/2011-06/filter.ome.xml similarity index 100% rename from specification/samples/2011-06/filter.ome.xml rename to specification/src/main/resources/samples/2011-06/filter.ome.xml diff --git a/specification/samples/2011-06/instrument.ome.xml b/specification/src/main/resources/samples/2011-06/instrument.ome.xml similarity index 100% rename from specification/samples/2011-06/instrument.ome.xml rename to specification/src/main/resources/samples/2011-06/instrument.ome.xml diff --git a/specification/samples/2011-06/metadata-only.ome.xml b/specification/src/main/resources/samples/2011-06/metadata-only.ome.xml similarity index 100% rename from specification/samples/2011-06/metadata-only.ome.xml rename to specification/src/main/resources/samples/2011-06/metadata-only.ome.xml diff --git a/specification/samples/2011-06/multi-channel-time-series.ome.xml b/specification/src/main/resources/samples/2011-06/multi-channel-time-series.ome.xml similarity index 100% rename from specification/samples/2011-06/multi-channel-time-series.ome.xml rename to specification/src/main/resources/samples/2011-06/multi-channel-time-series.ome.xml diff --git a/specification/samples/2011-06/multi-channel-z-series-time-series.ome.xml b/specification/src/main/resources/samples/2011-06/multi-channel-z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2011-06/multi-channel-z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2011-06/multi-channel-z-series-time-series.ome.xml diff --git a/specification/samples/2011-06/multi-channel-z-series.ome.xml b/specification/src/main/resources/samples/2011-06/multi-channel-z-series.ome.xml similarity index 100% rename from specification/samples/2011-06/multi-channel-z-series.ome.xml rename to specification/src/main/resources/samples/2011-06/multi-channel-z-series.ome.xml diff --git a/specification/samples/2011-06/multi-channel.ome.xml b/specification/src/main/resources/samples/2011-06/multi-channel.ome.xml similarity index 100% rename from specification/samples/2011-06/multi-channel.ome.xml rename to specification/src/main/resources/samples/2011-06/multi-channel.ome.xml diff --git a/specification/samples/2011-06/no-date.ome.xml b/specification/src/main/resources/samples/2011-06/no-date.ome.xml similarity index 100% rename from specification/samples/2011-06/no-date.ome.xml rename to specification/src/main/resources/samples/2011-06/no-date.ome.xml diff --git a/specification/samples/2011-06/one-screen-one-plate-four-wells.ome.xml b/specification/src/main/resources/samples/2011-06/one-screen-one-plate-four-wells.ome.xml similarity index 100% rename from specification/samples/2011-06/one-screen-one-plate-four-wells.ome.xml rename to specification/src/main/resources/samples/2011-06/one-screen-one-plate-four-wells.ome.xml diff --git a/specification/samples/2011-06/single-image.ome.xml b/specification/src/main/resources/samples/2011-06/single-image.ome.xml similarity index 100% rename from specification/samples/2011-06/single-image.ome.xml rename to specification/src/main/resources/samples/2011-06/single-image.ome.xml diff --git a/specification/samples/2011-06/spim.ome.xml b/specification/src/main/resources/samples/2011-06/spim.ome.xml similarity index 100% rename from specification/samples/2011-06/spim.ome.xml rename to specification/src/main/resources/samples/2011-06/spim.ome.xml diff --git a/specification/samples/2011-06/time-series.ome.xml b/specification/src/main/resources/samples/2011-06/time-series.ome.xml similarity index 100% rename from specification/samples/2011-06/time-series.ome.xml rename to specification/src/main/resources/samples/2011-06/time-series.ome.xml diff --git a/specification/samples/2011-06/transformations-upgrade.ome.xml b/specification/src/main/resources/samples/2011-06/transformations-upgrade.ome.xml similarity index 100% rename from specification/samples/2011-06/transformations-upgrade.ome.xml rename to specification/src/main/resources/samples/2011-06/transformations-upgrade.ome.xml diff --git a/specification/samples/2011-06/two-screens-two-plates-four-wells.ome.xml b/specification/src/main/resources/samples/2011-06/two-screens-two-plates-four-wells.ome.xml similarity index 100% rename from specification/samples/2011-06/two-screens-two-plates-four-wells.ome.xml rename to specification/src/main/resources/samples/2011-06/two-screens-two-plates-four-wells.ome.xml diff --git a/specification/samples/2011-06/xmlannotation-svg.ome.xml b/specification/src/main/resources/samples/2011-06/xmlannotation-svg.ome.xml similarity index 100% rename from specification/samples/2011-06/xmlannotation-svg.ome.xml rename to specification/src/main/resources/samples/2011-06/xmlannotation-svg.ome.xml diff --git a/specification/samples/2011-06/z-series-time-series.ome.xml b/specification/src/main/resources/samples/2011-06/z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2011-06/z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2011-06/z-series-time-series.ome.xml diff --git a/specification/samples/2011-06/z-series.ome.xml b/specification/src/main/resources/samples/2011-06/z-series.ome.xml similarity index 100% rename from specification/samples/2011-06/z-series.ome.xml rename to specification/src/main/resources/samples/2011-06/z-series.ome.xml diff --git a/specification/samples/2012-06/ROI.ome.xml b/specification/src/main/resources/samples/2012-06/ROI.ome.xml similarity index 100% rename from specification/samples/2012-06/ROI.ome.xml rename to specification/src/main/resources/samples/2012-06/ROI.ome.xml diff --git a/specification/samples/2012-06/filter.ome.xml b/specification/src/main/resources/samples/2012-06/filter.ome.xml similarity index 100% rename from specification/samples/2012-06/filter.ome.xml rename to specification/src/main/resources/samples/2012-06/filter.ome.xml diff --git a/specification/samples/2012-06/instrument.ome.xml b/specification/src/main/resources/samples/2012-06/instrument.ome.xml similarity index 100% rename from specification/samples/2012-06/instrument.ome.xml rename to specification/src/main/resources/samples/2012-06/instrument.ome.xml diff --git a/specification/samples/2012-06/metadata-only.ome.xml b/specification/src/main/resources/samples/2012-06/metadata-only.ome.xml similarity index 100% rename from specification/samples/2012-06/metadata-only.ome.xml rename to specification/src/main/resources/samples/2012-06/metadata-only.ome.xml diff --git a/specification/samples/2012-06/multi-channel-time-series.ome.xml b/specification/src/main/resources/samples/2012-06/multi-channel-time-series.ome.xml similarity index 100% rename from specification/samples/2012-06/multi-channel-time-series.ome.xml rename to specification/src/main/resources/samples/2012-06/multi-channel-time-series.ome.xml diff --git a/specification/samples/2012-06/multi-channel-z-series-time-series.ome.xml b/specification/src/main/resources/samples/2012-06/multi-channel-z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2012-06/multi-channel-z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2012-06/multi-channel-z-series-time-series.ome.xml diff --git a/specification/samples/2012-06/multi-channel-z-series.ome.xml b/specification/src/main/resources/samples/2012-06/multi-channel-z-series.ome.xml similarity index 100% rename from specification/samples/2012-06/multi-channel-z-series.ome.xml rename to specification/src/main/resources/samples/2012-06/multi-channel-z-series.ome.xml diff --git a/specification/samples/2012-06/multi-channel.ome.xml b/specification/src/main/resources/samples/2012-06/multi-channel.ome.xml similarity index 100% rename from specification/samples/2012-06/multi-channel.ome.xml rename to specification/src/main/resources/samples/2012-06/multi-channel.ome.xml diff --git a/specification/samples/2012-06/no-date.ome.xml b/specification/src/main/resources/samples/2012-06/no-date.ome.xml similarity index 100% rename from specification/samples/2012-06/no-date.ome.xml rename to specification/src/main/resources/samples/2012-06/no-date.ome.xml diff --git a/specification/samples/2012-06/one-screen-one-plate-four-wells.ome.xml b/specification/src/main/resources/samples/2012-06/one-screen-one-plate-four-wells.ome.xml similarity index 100% rename from specification/samples/2012-06/one-screen-one-plate-four-wells.ome.xml rename to specification/src/main/resources/samples/2012-06/one-screen-one-plate-four-wells.ome.xml diff --git a/specification/samples/2012-06/single-image.ome.xml b/specification/src/main/resources/samples/2012-06/single-image.ome.xml similarity index 100% rename from specification/samples/2012-06/single-image.ome.xml rename to specification/src/main/resources/samples/2012-06/single-image.ome.xml diff --git a/specification/samples/2012-06/spim.ome.xml b/specification/src/main/resources/samples/2012-06/spim.ome.xml similarity index 100% rename from specification/samples/2012-06/spim.ome.xml rename to specification/src/main/resources/samples/2012-06/spim.ome.xml diff --git a/specification/samples/2012-06/tagannotation.ome.xml b/specification/src/main/resources/samples/2012-06/tagannotation.ome.xml similarity index 100% rename from specification/samples/2012-06/tagannotation.ome.xml rename to specification/src/main/resources/samples/2012-06/tagannotation.ome.xml diff --git a/specification/samples/2012-06/time-series.ome.xml b/specification/src/main/resources/samples/2012-06/time-series.ome.xml similarity index 100% rename from specification/samples/2012-06/time-series.ome.xml rename to specification/src/main/resources/samples/2012-06/time-series.ome.xml diff --git a/specification/samples/2012-06/transformations-downgrade.ome.xml b/specification/src/main/resources/samples/2012-06/transformations-downgrade.ome.xml similarity index 100% rename from specification/samples/2012-06/transformations-downgrade.ome.xml rename to specification/src/main/resources/samples/2012-06/transformations-downgrade.ome.xml diff --git a/specification/samples/2012-06/transformations-upgrade.ome.xml b/specification/src/main/resources/samples/2012-06/transformations-upgrade.ome.xml similarity index 100% rename from specification/samples/2012-06/transformations-upgrade.ome.xml rename to specification/src/main/resources/samples/2012-06/transformations-upgrade.ome.xml diff --git a/specification/samples/2012-06/two-screens-two-plates-four-wells.ome.xml b/specification/src/main/resources/samples/2012-06/two-screens-two-plates-four-wells.ome.xml similarity index 100% rename from specification/samples/2012-06/two-screens-two-plates-four-wells.ome.xml rename to specification/src/main/resources/samples/2012-06/two-screens-two-plates-four-wells.ome.xml diff --git a/specification/samples/2012-06/xmlannotation-svg.ome.xml b/specification/src/main/resources/samples/2012-06/xmlannotation-svg.ome.xml similarity index 100% rename from specification/samples/2012-06/xmlannotation-svg.ome.xml rename to specification/src/main/resources/samples/2012-06/xmlannotation-svg.ome.xml diff --git a/specification/samples/2012-06/z-series-time-series.ome.xml b/specification/src/main/resources/samples/2012-06/z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2012-06/z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2012-06/z-series-time-series.ome.xml diff --git a/specification/samples/2012-06/z-series.ome.xml b/specification/src/main/resources/samples/2012-06/z-series.ome.xml similarity index 100% rename from specification/samples/2012-06/z-series.ome.xml rename to specification/src/main/resources/samples/2012-06/z-series.ome.xml diff --git a/specification/samples/2013-06/ROI.ome.xml b/specification/src/main/resources/samples/2013-06/ROI.ome.xml similarity index 100% rename from specification/samples/2013-06/ROI.ome.xml rename to specification/src/main/resources/samples/2013-06/ROI.ome.xml diff --git a/specification/samples/2013-06/commentannotation.ome.xml b/specification/src/main/resources/samples/2013-06/commentannotation.ome.xml similarity index 100% rename from specification/samples/2013-06/commentannotation.ome.xml rename to specification/src/main/resources/samples/2013-06/commentannotation.ome.xml diff --git a/specification/samples/2013-06/filter.ome.xml b/specification/src/main/resources/samples/2013-06/filter.ome.xml similarity index 100% rename from specification/samples/2013-06/filter.ome.xml rename to specification/src/main/resources/samples/2013-06/filter.ome.xml diff --git a/specification/samples/2013-06/instrument.ome.xml b/specification/src/main/resources/samples/2013-06/instrument.ome.xml similarity index 100% rename from specification/samples/2013-06/instrument.ome.xml rename to specification/src/main/resources/samples/2013-06/instrument.ome.xml diff --git a/specification/samples/2013-06/metadata-only.ome.xml b/specification/src/main/resources/samples/2013-06/metadata-only.ome.xml similarity index 100% rename from specification/samples/2013-06/metadata-only.ome.xml rename to specification/src/main/resources/samples/2013-06/metadata-only.ome.xml diff --git a/specification/samples/2013-06/multi-channel-time-series.ome.xml b/specification/src/main/resources/samples/2013-06/multi-channel-time-series.ome.xml similarity index 100% rename from specification/samples/2013-06/multi-channel-time-series.ome.xml rename to specification/src/main/resources/samples/2013-06/multi-channel-time-series.ome.xml diff --git a/specification/samples/2013-06/multi-channel-z-series-time-series.ome.xml b/specification/src/main/resources/samples/2013-06/multi-channel-z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2013-06/multi-channel-z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2013-06/multi-channel-z-series-time-series.ome.xml diff --git a/specification/samples/2013-06/multi-channel-z-series.ome.xml b/specification/src/main/resources/samples/2013-06/multi-channel-z-series.ome.xml similarity index 100% rename from specification/samples/2013-06/multi-channel-z-series.ome.xml rename to specification/src/main/resources/samples/2013-06/multi-channel-z-series.ome.xml diff --git a/specification/samples/2013-06/multi-channel.ome.xml b/specification/src/main/resources/samples/2013-06/multi-channel.ome.xml similarity index 100% rename from specification/samples/2013-06/multi-channel.ome.xml rename to specification/src/main/resources/samples/2013-06/multi-channel.ome.xml diff --git a/specification/samples/2013-06/no-date.ome.xml b/specification/src/main/resources/samples/2013-06/no-date.ome.xml similarity index 100% rename from specification/samples/2013-06/no-date.ome.xml rename to specification/src/main/resources/samples/2013-06/no-date.ome.xml diff --git a/specification/samples/2013-06/one-screen-one-plate-four-wells.ome.xml b/specification/src/main/resources/samples/2013-06/one-screen-one-plate-four-wells.ome.xml similarity index 100% rename from specification/samples/2013-06/one-screen-one-plate-four-wells.ome.xml rename to specification/src/main/resources/samples/2013-06/one-screen-one-plate-four-wells.ome.xml diff --git a/specification/samples/2013-06/single-image.ome.xml b/specification/src/main/resources/samples/2013-06/single-image.ome.xml similarity index 100% rename from specification/samples/2013-06/single-image.ome.xml rename to specification/src/main/resources/samples/2013-06/single-image.ome.xml diff --git a/specification/samples/2013-06/spim.ome.xml b/specification/src/main/resources/samples/2013-06/spim.ome.xml similarity index 100% rename from specification/samples/2013-06/spim.ome.xml rename to specification/src/main/resources/samples/2013-06/spim.ome.xml diff --git a/specification/samples/2013-06/tagannotation.ome.xml b/specification/src/main/resources/samples/2013-06/tagannotation.ome.xml similarity index 100% rename from specification/samples/2013-06/tagannotation.ome.xml rename to specification/src/main/resources/samples/2013-06/tagannotation.ome.xml diff --git a/specification/samples/2013-06/time-series.ome.xml b/specification/src/main/resources/samples/2013-06/time-series.ome.xml similarity index 100% rename from specification/samples/2013-06/time-series.ome.xml rename to specification/src/main/resources/samples/2013-06/time-series.ome.xml diff --git a/specification/samples/2013-06/timestampannotation-posix-only.ome.xml b/specification/src/main/resources/samples/2013-06/timestampannotation-posix-only.ome.xml similarity index 100% rename from specification/samples/2013-06/timestampannotation-posix-only.ome.xml rename to specification/src/main/resources/samples/2013-06/timestampannotation-posix-only.ome.xml diff --git a/specification/samples/2013-06/timestampannotation.ome.xml b/specification/src/main/resources/samples/2013-06/timestampannotation.ome.xml similarity index 100% rename from specification/samples/2013-06/timestampannotation.ome.xml rename to specification/src/main/resources/samples/2013-06/timestampannotation.ome.xml diff --git a/specification/samples/2013-06/transformations-downgrade.ome.xml b/specification/src/main/resources/samples/2013-06/transformations-downgrade.ome.xml similarity index 100% rename from specification/samples/2013-06/transformations-downgrade.ome.xml rename to specification/src/main/resources/samples/2013-06/transformations-downgrade.ome.xml diff --git a/specification/samples/2013-06/transformations-upgrade.ome.xml b/specification/src/main/resources/samples/2013-06/transformations-upgrade.ome.xml similarity index 100% rename from specification/samples/2013-06/transformations-upgrade.ome.xml rename to specification/src/main/resources/samples/2013-06/transformations-upgrade.ome.xml diff --git a/specification/samples/2013-06/two-screens-two-plates-four-wells.ome.xml b/specification/src/main/resources/samples/2013-06/two-screens-two-plates-four-wells.ome.xml similarity index 100% rename from specification/samples/2013-06/two-screens-two-plates-four-wells.ome.xml rename to specification/src/main/resources/samples/2013-06/two-screens-two-plates-four-wells.ome.xml diff --git a/specification/samples/2013-06/xmlannotation-body-space.ome.xml b/specification/src/main/resources/samples/2013-06/xmlannotation-body-space.ome.xml similarity index 100% rename from specification/samples/2013-06/xmlannotation-body-space.ome.xml rename to specification/src/main/resources/samples/2013-06/xmlannotation-body-space.ome.xml diff --git a/specification/samples/2013-06/xmlannotation-multi-value.ome.xml b/specification/src/main/resources/samples/2013-06/xmlannotation-multi-value.ome.xml similarity index 100% rename from specification/samples/2013-06/xmlannotation-multi-value.ome.xml rename to specification/src/main/resources/samples/2013-06/xmlannotation-multi-value.ome.xml diff --git a/specification/samples/2013-06/xmlannotation-svg.ome.xml b/specification/src/main/resources/samples/2013-06/xmlannotation-svg.ome.xml similarity index 100% rename from specification/samples/2013-06/xmlannotation-svg.ome.xml rename to specification/src/main/resources/samples/2013-06/xmlannotation-svg.ome.xml diff --git a/specification/samples/2013-06/z-series-time-series.ome.xml b/specification/src/main/resources/samples/2013-06/z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2013-06/z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2013-06/z-series-time-series.ome.xml diff --git a/specification/samples/2013-06/z-series.ome.xml b/specification/src/main/resources/samples/2013-06/z-series.ome.xml similarity index 100% rename from specification/samples/2013-06/z-series.ome.xml rename to specification/src/main/resources/samples/2013-06/z-series.ome.xml diff --git a/specification/samples/2015-01/ROI.ome.xml b/specification/src/main/resources/samples/2015-01/ROI.ome.xml similarity index 100% rename from specification/samples/2015-01/ROI.ome.xml rename to specification/src/main/resources/samples/2015-01/ROI.ome.xml diff --git a/specification/samples/2015-01/commentannotation.ome.xml b/specification/src/main/resources/samples/2015-01/commentannotation.ome.xml similarity index 100% rename from specification/samples/2015-01/commentannotation.ome.xml rename to specification/src/main/resources/samples/2015-01/commentannotation.ome.xml diff --git a/specification/samples/2015-01/filter.ome.xml b/specification/src/main/resources/samples/2015-01/filter.ome.xml similarity index 100% rename from specification/samples/2015-01/filter.ome.xml rename to specification/src/main/resources/samples/2015-01/filter.ome.xml diff --git a/specification/samples/2015-01/hcs.ome.xml b/specification/src/main/resources/samples/2015-01/hcs.ome.xml similarity index 100% rename from specification/samples/2015-01/hcs.ome.xml rename to specification/src/main/resources/samples/2015-01/hcs.ome.xml diff --git a/specification/samples/2015-01/instrument-units-alternate.ome.xml b/specification/src/main/resources/samples/2015-01/instrument-units-alternate.ome.xml similarity index 100% rename from specification/samples/2015-01/instrument-units-alternate.ome.xml rename to specification/src/main/resources/samples/2015-01/instrument-units-alternate.ome.xml diff --git a/specification/samples/2015-01/instrument-units-default.ome.xml b/specification/src/main/resources/samples/2015-01/instrument-units-default.ome.xml similarity index 100% rename from specification/samples/2015-01/instrument-units-default.ome.xml rename to specification/src/main/resources/samples/2015-01/instrument-units-default.ome.xml diff --git a/specification/samples/2015-01/instrument.ome.xml b/specification/src/main/resources/samples/2015-01/instrument.ome.xml similarity index 100% rename from specification/samples/2015-01/instrument.ome.xml rename to specification/src/main/resources/samples/2015-01/instrument.ome.xml diff --git a/specification/samples/2015-01/mapannotation.ome.xml b/specification/src/main/resources/samples/2015-01/mapannotation.ome.xml similarity index 100% rename from specification/samples/2015-01/mapannotation.ome.xml rename to specification/src/main/resources/samples/2015-01/mapannotation.ome.xml diff --git a/specification/samples/2015-01/metadata-only.ome.xml b/specification/src/main/resources/samples/2015-01/metadata-only.ome.xml similarity index 100% rename from specification/samples/2015-01/metadata-only.ome.xml rename to specification/src/main/resources/samples/2015-01/metadata-only.ome.xml diff --git a/specification/samples/2015-01/minimum-specification.ome.xml b/specification/src/main/resources/samples/2015-01/minimum-specification.ome.xml similarity index 100% rename from specification/samples/2015-01/minimum-specification.ome.xml rename to specification/src/main/resources/samples/2015-01/minimum-specification.ome.xml diff --git a/specification/samples/2015-01/multi-channel-time-series.ome.xml b/specification/src/main/resources/samples/2015-01/multi-channel-time-series.ome.xml similarity index 100% rename from specification/samples/2015-01/multi-channel-time-series.ome.xml rename to specification/src/main/resources/samples/2015-01/multi-channel-time-series.ome.xml diff --git a/specification/samples/2015-01/multi-channel-z-series-time-series.ome.xml b/specification/src/main/resources/samples/2015-01/multi-channel-z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2015-01/multi-channel-z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2015-01/multi-channel-z-series-time-series.ome.xml diff --git a/specification/samples/2015-01/multi-channel-z-series.ome.xml b/specification/src/main/resources/samples/2015-01/multi-channel-z-series.ome.xml similarity index 100% rename from specification/samples/2015-01/multi-channel-z-series.ome.xml rename to specification/src/main/resources/samples/2015-01/multi-channel-z-series.ome.xml diff --git a/specification/samples/2015-01/multi-channel.ome.xml b/specification/src/main/resources/samples/2015-01/multi-channel.ome.xml similarity index 100% rename from specification/samples/2015-01/multi-channel.ome.xml rename to specification/src/main/resources/samples/2015-01/multi-channel.ome.xml diff --git a/specification/samples/2015-01/no-date.ome.xml b/specification/src/main/resources/samples/2015-01/no-date.ome.xml similarity index 100% rename from specification/samples/2015-01/no-date.ome.xml rename to specification/src/main/resources/samples/2015-01/no-date.ome.xml diff --git a/specification/samples/2015-01/one-screen-one-plate-four-wells.ome.xml b/specification/src/main/resources/samples/2015-01/one-screen-one-plate-four-wells.ome.xml similarity index 100% rename from specification/samples/2015-01/one-screen-one-plate-four-wells.ome.xml rename to specification/src/main/resources/samples/2015-01/one-screen-one-plate-four-wells.ome.xml diff --git a/specification/samples/2015-01/single-image.ome.xml b/specification/src/main/resources/samples/2015-01/single-image.ome.xml similarity index 100% rename from specification/samples/2015-01/single-image.ome.xml rename to specification/src/main/resources/samples/2015-01/single-image.ome.xml diff --git a/specification/samples/2015-01/spim.ome.xml b/specification/src/main/resources/samples/2015-01/spim.ome.xml similarity index 100% rename from specification/samples/2015-01/spim.ome.xml rename to specification/src/main/resources/samples/2015-01/spim.ome.xml diff --git a/specification/samples/2015-01/tagannotation.ome.xml b/specification/src/main/resources/samples/2015-01/tagannotation.ome.xml similarity index 100% rename from specification/samples/2015-01/tagannotation.ome.xml rename to specification/src/main/resources/samples/2015-01/tagannotation.ome.xml diff --git a/specification/samples/2015-01/time-series.ome.xml b/specification/src/main/resources/samples/2015-01/time-series.ome.xml similarity index 100% rename from specification/samples/2015-01/time-series.ome.xml rename to specification/src/main/resources/samples/2015-01/time-series.ome.xml diff --git a/specification/samples/2015-01/timestampannotation-posix-only.ome.xml b/specification/src/main/resources/samples/2015-01/timestampannotation-posix-only.ome.xml similarity index 100% rename from specification/samples/2015-01/timestampannotation-posix-only.ome.xml rename to specification/src/main/resources/samples/2015-01/timestampannotation-posix-only.ome.xml diff --git a/specification/samples/2015-01/timestampannotation.ome.xml b/specification/src/main/resources/samples/2015-01/timestampannotation.ome.xml similarity index 100% rename from specification/samples/2015-01/timestampannotation.ome.xml rename to specification/src/main/resources/samples/2015-01/timestampannotation.ome.xml diff --git a/specification/samples/2015-01/transformations-downgrade.ome.xml b/specification/src/main/resources/samples/2015-01/transformations-downgrade.ome.xml similarity index 100% rename from specification/samples/2015-01/transformations-downgrade.ome.xml rename to specification/src/main/resources/samples/2015-01/transformations-downgrade.ome.xml diff --git a/specification/samples/2015-01/transformations-upgrade.ome.xml b/specification/src/main/resources/samples/2015-01/transformations-upgrade.ome.xml similarity index 100% rename from specification/samples/2015-01/transformations-upgrade.ome.xml rename to specification/src/main/resources/samples/2015-01/transformations-upgrade.ome.xml diff --git a/specification/samples/2015-01/two-screens-two-plates-four-wells.ome.xml b/specification/src/main/resources/samples/2015-01/two-screens-two-plates-four-wells.ome.xml similarity index 100% rename from specification/samples/2015-01/two-screens-two-plates-four-wells.ome.xml rename to specification/src/main/resources/samples/2015-01/two-screens-two-plates-four-wells.ome.xml diff --git a/specification/samples/2015-01/xmlannotation-body-space.ome.xml b/specification/src/main/resources/samples/2015-01/xmlannotation-body-space.ome.xml similarity index 100% rename from specification/samples/2015-01/xmlannotation-body-space.ome.xml rename to specification/src/main/resources/samples/2015-01/xmlannotation-body-space.ome.xml diff --git a/specification/samples/2015-01/xmlannotation-multi-value.ome.xml b/specification/src/main/resources/samples/2015-01/xmlannotation-multi-value.ome.xml similarity index 100% rename from specification/samples/2015-01/xmlannotation-multi-value.ome.xml rename to specification/src/main/resources/samples/2015-01/xmlannotation-multi-value.ome.xml diff --git a/specification/samples/2015-01/xmlannotation-svg.ome.xml b/specification/src/main/resources/samples/2015-01/xmlannotation-svg.ome.xml similarity index 100% rename from specification/samples/2015-01/xmlannotation-svg.ome.xml rename to specification/src/main/resources/samples/2015-01/xmlannotation-svg.ome.xml diff --git a/specification/samples/2015-01/z-series-time-series.ome.xml b/specification/src/main/resources/samples/2015-01/z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2015-01/z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2015-01/z-series-time-series.ome.xml diff --git a/specification/samples/2015-01/z-series.ome.xml b/specification/src/main/resources/samples/2015-01/z-series.ome.xml similarity index 100% rename from specification/samples/2015-01/z-series.ome.xml rename to specification/src/main/resources/samples/2015-01/z-series.ome.xml diff --git a/specification/samples/2016-06/ROI.ome.xml b/specification/src/main/resources/samples/2016-06/ROI.ome.xml similarity index 100% rename from specification/samples/2016-06/ROI.ome.xml rename to specification/src/main/resources/samples/2016-06/ROI.ome.xml diff --git a/specification/samples/2016-06/commentannotation.ome.xml b/specification/src/main/resources/samples/2016-06/commentannotation.ome.xml similarity index 100% rename from specification/samples/2016-06/commentannotation.ome.xml rename to specification/src/main/resources/samples/2016-06/commentannotation.ome.xml diff --git a/specification/samples/2016-06/filter.ome.xml b/specification/src/main/resources/samples/2016-06/filter.ome.xml similarity index 100% rename from specification/samples/2016-06/filter.ome.xml rename to specification/src/main/resources/samples/2016-06/filter.ome.xml diff --git a/specification/samples/2016-06/folders-larger-taxonomy.ome.xml b/specification/src/main/resources/samples/2016-06/folders-larger-taxonomy.ome.xml similarity index 100% rename from specification/samples/2016-06/folders-larger-taxonomy.ome.xml rename to specification/src/main/resources/samples/2016-06/folders-larger-taxonomy.ome.xml diff --git a/specification/samples/2016-06/folders-simple-taxonomy.ome.xml b/specification/src/main/resources/samples/2016-06/folders-simple-taxonomy.ome.xml similarity index 100% rename from specification/samples/2016-06/folders-simple-taxonomy.ome.xml rename to specification/src/main/resources/samples/2016-06/folders-simple-taxonomy.ome.xml diff --git a/specification/samples/2016-06/hcs.ome.xml b/specification/src/main/resources/samples/2016-06/hcs.ome.xml similarity index 100% rename from specification/samples/2016-06/hcs.ome.xml rename to specification/src/main/resources/samples/2016-06/hcs.ome.xml diff --git a/specification/samples/2016-06/instrument-units-alternate.ome.xml b/specification/src/main/resources/samples/2016-06/instrument-units-alternate.ome.xml similarity index 100% rename from specification/samples/2016-06/instrument-units-alternate.ome.xml rename to specification/src/main/resources/samples/2016-06/instrument-units-alternate.ome.xml diff --git a/specification/samples/2016-06/instrument-units-default.ome.xml b/specification/src/main/resources/samples/2016-06/instrument-units-default.ome.xml similarity index 100% rename from specification/samples/2016-06/instrument-units-default.ome.xml rename to specification/src/main/resources/samples/2016-06/instrument-units-default.ome.xml diff --git a/specification/samples/2016-06/instrument.ome.xml b/specification/src/main/resources/samples/2016-06/instrument.ome.xml similarity index 100% rename from specification/samples/2016-06/instrument.ome.xml rename to specification/src/main/resources/samples/2016-06/instrument.ome.xml diff --git a/specification/samples/2016-06/mapannotation.ome.xml b/specification/src/main/resources/samples/2016-06/mapannotation.ome.xml similarity index 100% rename from specification/samples/2016-06/mapannotation.ome.xml rename to specification/src/main/resources/samples/2016-06/mapannotation.ome.xml diff --git a/specification/samples/2016-06/metadata-only.ome.xml b/specification/src/main/resources/samples/2016-06/metadata-only.ome.xml similarity index 100% rename from specification/samples/2016-06/metadata-only.ome.xml rename to specification/src/main/resources/samples/2016-06/metadata-only.ome.xml diff --git a/specification/samples/2016-06/minimum-specification.ome.xml b/specification/src/main/resources/samples/2016-06/minimum-specification.ome.xml similarity index 100% rename from specification/samples/2016-06/minimum-specification.ome.xml rename to specification/src/main/resources/samples/2016-06/minimum-specification.ome.xml diff --git a/specification/samples/2016-06/multi-channel-time-series.ome.xml b/specification/src/main/resources/samples/2016-06/multi-channel-time-series.ome.xml similarity index 100% rename from specification/samples/2016-06/multi-channel-time-series.ome.xml rename to specification/src/main/resources/samples/2016-06/multi-channel-time-series.ome.xml diff --git a/specification/samples/2016-06/multi-channel-z-series-time-series.ome.xml b/specification/src/main/resources/samples/2016-06/multi-channel-z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2016-06/multi-channel-z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2016-06/multi-channel-z-series-time-series.ome.xml diff --git a/specification/samples/2016-06/multi-channel-z-series.ome.xml b/specification/src/main/resources/samples/2016-06/multi-channel-z-series.ome.xml similarity index 100% rename from specification/samples/2016-06/multi-channel-z-series.ome.xml rename to specification/src/main/resources/samples/2016-06/multi-channel-z-series.ome.xml diff --git a/specification/samples/2016-06/multi-channel.ome.xml b/specification/src/main/resources/samples/2016-06/multi-channel.ome.xml similarity index 100% rename from specification/samples/2016-06/multi-channel.ome.xml rename to specification/src/main/resources/samples/2016-06/multi-channel.ome.xml diff --git a/specification/samples/2016-06/no-date.ome.xml b/specification/src/main/resources/samples/2016-06/no-date.ome.xml similarity index 100% rename from specification/samples/2016-06/no-date.ome.xml rename to specification/src/main/resources/samples/2016-06/no-date.ome.xml diff --git a/specification/samples/2016-06/one-screen-one-plate-four-wells.ome.xml b/specification/src/main/resources/samples/2016-06/one-screen-one-plate-four-wells.ome.xml similarity index 100% rename from specification/samples/2016-06/one-screen-one-plate-four-wells.ome.xml rename to specification/src/main/resources/samples/2016-06/one-screen-one-plate-four-wells.ome.xml diff --git a/specification/samples/2016-06/single-image.ome.xml b/specification/src/main/resources/samples/2016-06/single-image.ome.xml similarity index 100% rename from specification/samples/2016-06/single-image.ome.xml rename to specification/src/main/resources/samples/2016-06/single-image.ome.xml diff --git a/specification/samples/2016-06/spim.ome.xml b/specification/src/main/resources/samples/2016-06/spim.ome.xml similarity index 100% rename from specification/samples/2016-06/spim.ome.xml rename to specification/src/main/resources/samples/2016-06/spim.ome.xml diff --git a/specification/samples/2016-06/tagannotation.ome.xml b/specification/src/main/resources/samples/2016-06/tagannotation.ome.xml similarity index 100% rename from specification/samples/2016-06/tagannotation.ome.xml rename to specification/src/main/resources/samples/2016-06/tagannotation.ome.xml diff --git a/specification/samples/2016-06/time-series.ome.xml b/specification/src/main/resources/samples/2016-06/time-series.ome.xml similarity index 100% rename from specification/samples/2016-06/time-series.ome.xml rename to specification/src/main/resources/samples/2016-06/time-series.ome.xml diff --git a/specification/samples/2016-06/timestampannotation-posix-only.ome.xml b/specification/src/main/resources/samples/2016-06/timestampannotation-posix-only.ome.xml similarity index 100% rename from specification/samples/2016-06/timestampannotation-posix-only.ome.xml rename to specification/src/main/resources/samples/2016-06/timestampannotation-posix-only.ome.xml diff --git a/specification/samples/2016-06/timestampannotation.ome.xml b/specification/src/main/resources/samples/2016-06/timestampannotation.ome.xml similarity index 100% rename from specification/samples/2016-06/timestampannotation.ome.xml rename to specification/src/main/resources/samples/2016-06/timestampannotation.ome.xml diff --git a/specification/samples/2016-06/transformations-downgrade.ome.xml b/specification/src/main/resources/samples/2016-06/transformations-downgrade.ome.xml similarity index 100% rename from specification/samples/2016-06/transformations-downgrade.ome.xml rename to specification/src/main/resources/samples/2016-06/transformations-downgrade.ome.xml diff --git a/specification/samples/2016-06/transformations-upgrade.ome.xml b/specification/src/main/resources/samples/2016-06/transformations-upgrade.ome.xml similarity index 100% rename from specification/samples/2016-06/transformations-upgrade.ome.xml rename to specification/src/main/resources/samples/2016-06/transformations-upgrade.ome.xml diff --git a/specification/samples/2016-06/two-screens-two-plates-four-wells.ome.xml b/specification/src/main/resources/samples/2016-06/two-screens-two-plates-four-wells.ome.xml similarity index 100% rename from specification/samples/2016-06/two-screens-two-plates-four-wells.ome.xml rename to specification/src/main/resources/samples/2016-06/two-screens-two-plates-four-wells.ome.xml diff --git a/specification/samples/2016-06/xmlannotation-body-space.ome.xml b/specification/src/main/resources/samples/2016-06/xmlannotation-body-space.ome.xml similarity index 100% rename from specification/samples/2016-06/xmlannotation-body-space.ome.xml rename to specification/src/main/resources/samples/2016-06/xmlannotation-body-space.ome.xml diff --git a/specification/samples/2016-06/xmlannotation-multi-value.ome.xml b/specification/src/main/resources/samples/2016-06/xmlannotation-multi-value.ome.xml similarity index 100% rename from specification/samples/2016-06/xmlannotation-multi-value.ome.xml rename to specification/src/main/resources/samples/2016-06/xmlannotation-multi-value.ome.xml diff --git a/specification/samples/2016-06/xmlannotation-svg.ome.xml b/specification/src/main/resources/samples/2016-06/xmlannotation-svg.ome.xml similarity index 100% rename from specification/samples/2016-06/xmlannotation-svg.ome.xml rename to specification/src/main/resources/samples/2016-06/xmlannotation-svg.ome.xml diff --git a/specification/samples/2016-06/z-series-time-series.ome.xml b/specification/src/main/resources/samples/2016-06/z-series-time-series.ome.xml similarity index 100% rename from specification/samples/2016-06/z-series-time-series.ome.xml rename to specification/src/main/resources/samples/2016-06/z-series-time-series.ome.xml diff --git a/specification/samples/2016-06/z-series.ome.xml b/specification/src/main/resources/samples/2016-06/z-series.ome.xml similarity index 100% rename from specification/samples/2016-06/z-series.ome.xml rename to specification/src/main/resources/samples/2016-06/z-series.ome.xml From 7d279199e548db7014df389010b12d6fd391aff7 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Tue, 30 Oct 2018 00:01:59 +0000 Subject: [PATCH 2/2] Rename released-schema as schemas --- cmake/XsdFu.cmake | 2 +- ome-xml/CMakeLists.txt | 2 +- ome-xml/src/main/cpp/ome/xml/CMakeLists.txt | 14 +++++++------- pom.xml | 2 +- specification/publish | 10 +++++----- .../java/ome/specification/SchemaResolver.java | 6 +++--- .../2003-FC/AnalysisChain.xsd | 0 .../2003-FC/AnalysisModule.xsd | 0 .../2003-FC/BinaryFile.xsd | 0 .../{released-schema => schemas}/2003-FC/CA.xsd | 0 .../{released-schema => schemas}/2003-FC/CLI.xsd | 0 .../2003-FC/DataHistory.xsd | 0 .../{released-schema => schemas}/2003-FC/MLI.xsd | 0 .../{released-schema => schemas}/2003-FC/STD.xsd | 0 .../2003-FC/catalog.xml | 0 .../{released-schema => schemas}/2003-FC/ome.xsd | 0 .../2003-IR1/DataHistory.xsd | 0 .../2003-IR1/catalog.xml | 0 .../2003-IR2/DataHistory.xsd | 0 .../{released-schema => schemas}/2003-IR2/MLI.xsd | 0 .../2003-IR2/catalog.xml | 0 .../2003-IR3/AnalysisModule.xsd | 0 .../2003-IR3/DataHistory.xsd | 0 .../2003-IR3/catalog.xml | 0 .../2003-RC1/AnalysisChain.xsd | 0 .../2003-RC1/AnalysisModule.xsd | 0 .../2003-RC1/BinaryFile.xsd | 0 .../{released-schema => schemas}/2003-RC1/CA.xsd | 0 .../{released-schema => schemas}/2003-RC1/CLI.xsd | 0 .../{released-schema => schemas}/2003-RC1/STD.xsd | 0 .../2003-RC1/catalog.xml | 0 .../{released-schema => schemas}/2003-RC2/STD.xsd | 0 .../2003-RC2/catalog.xml | 0 .../{released-schema => schemas}/2003-RC2/ome.xsd | 0 .../{released-schema => schemas}/2003-RC3/STD.xsd | 0 .../2003-RC3/catalog.xml | 0 .../{released-schema => schemas}/2003-RC3/ome.xsd | 0 .../{released-schema => schemas}/2003-RC4/STD.xsd | 0 .../2003-RC4/catalog.xml | 0 .../{released-schema => schemas}/2003-RC4/ome.xsd | 0 .../2003-RC5/catalog.xml | 0 .../{released-schema => schemas}/2003-RC5/ome.xsd | 0 .../2003-RC6/catalog.xml | 0 .../{released-schema => schemas}/2003-RC6/ome.xsd | 0 .../2007-06/AnalysisChain.xsd | 0 .../2007-06/AnalysisModule.xsd | 0 .../2007-06/BinaryFile.xsd | 0 .../{released-schema => schemas}/2007-06/CA.xsd | 0 .../{released-schema => schemas}/2007-06/CLI.xsd | 0 .../2007-06/DataHistory.xsd | 0 .../{released-schema => schemas}/2007-06/MLI.xsd | 0 .../{released-schema => schemas}/2007-06/SPW.xsd | 0 .../{released-schema => schemas}/2007-06/STD.xsd | 0 .../2007-06/catalog.xml | 0 .../{released-schema => schemas}/2007-06/ome.xsd | 0 .../2008-02/AnalysisChain.xsd | 0 .../2008-02/AnalysisModule.xsd | 0 .../2008-02/BinaryFile.xsd | 0 .../{released-schema => schemas}/2008-02/CA.xsd | 0 .../{released-schema => schemas}/2008-02/CLI.xsd | 0 .../2008-02/DataHistory.xsd | 0 .../{released-schema => schemas}/2008-02/MLI.xsd | 0 .../{released-schema => schemas}/2008-02/SPW.xsd | 0 .../{released-schema => schemas}/2008-02/STD.xsd | 0 .../2008-02/catalog.xml | 0 .../{released-schema => schemas}/2008-02/ome.xsd | 0 .../2008-04/Editor.xsd | 0 .../2008-04/catalog.xml | 0 .../2008-09/AnalysisChain.xsd | 0 .../2008-09/AnalysisModule.xsd | 0 .../2008-09/BinaryFile.xsd | 0 .../{released-schema => schemas}/2008-09/CA.xsd | 0 .../{released-schema => schemas}/2008-09/CLI.xsd | 0 .../2008-09/DataHistory.xsd | 0 .../{released-schema => schemas}/2008-09/MLI.xsd | 0 .../{released-schema => schemas}/2008-09/OMERO.xsd | 0 .../{released-schema => schemas}/2008-09/SA.xsd | 0 .../{released-schema => schemas}/2008-09/SPW.xsd | 0 .../{released-schema => schemas}/2008-09/STD.xsd | 0 .../2008-09/catalog.xml | 0 .../{released-schema => schemas}/2008-09/ome.xsd | 0 .../2009-09/AnalysisChain.xsd | 0 .../2009-09/AnalysisModule.xsd | 0 .../2009-09/BinaryFile.xsd | 0 .../{released-schema => schemas}/2009-09/CA.xsd | 0 .../{released-schema => schemas}/2009-09/CLI.xsd | 0 .../2009-09/DataHistory.xsd | 0 .../{released-schema => schemas}/2009-09/MLI.xsd | 0 .../{released-schema => schemas}/2009-09/OMERO.xsd | 0 .../{released-schema => schemas}/2009-09/ROI.xsd | 0 .../{released-schema => schemas}/2009-09/SA.xsd | 0 .../{released-schema => schemas}/2009-09/SPW.xsd | 0 .../{released-schema => schemas}/2009-09/STD.xsd | 0 .../2009-09/catalog.xml | 0 .../{released-schema => schemas}/2009-09/ome.xsd | 0 .../2010-04/BinaryFile.xsd | 0 .../{released-schema => schemas}/2010-04/OMERO.xsd | 0 .../{released-schema => schemas}/2010-04/ROI.xsd | 0 .../{released-schema => schemas}/2010-04/SA.xsd | 0 .../{released-schema => schemas}/2010-04/SPW.xsd | 0 .../2010-04/catalog.xml | 0 .../{released-schema => schemas}/2010-04/ome.xsd | 0 .../2010-06/BinaryFile.xsd | 0 .../{released-schema => schemas}/2010-06/OMERO.xsd | 0 .../{released-schema => schemas}/2010-06/ROI.xsd | 0 .../{released-schema => schemas}/2010-06/SA.xsd | 0 .../{released-schema => schemas}/2010-06/SPW.xsd | 0 .../2010-06/catalog.xml | 0 .../{released-schema => schemas}/2010-06/ome.xsd | 0 .../2011-06/BinaryFile.xsd | 0 .../{released-schema => schemas}/2011-06/OMERO.xsd | 0 .../{released-schema => schemas}/2011-06/ROI.xsd | 0 .../{released-schema => schemas}/2011-06/SA.xsd | 0 .../{released-schema => schemas}/2011-06/SPW.xsd | 0 .../2011-06/catalog.xml | 0 .../{released-schema => schemas}/2011-06/ome.xsd | 0 .../2012-06/BinaryFile.xsd | 0 .../{released-schema => schemas}/2012-06/ROI.xsd | 0 .../{released-schema => schemas}/2012-06/SA.xsd | 0 .../{released-schema => schemas}/2012-06/SPW.xsd | 0 .../2012-06/catalog.xml | 0 .../{released-schema => schemas}/2012-06/ome.xsd | 0 .../2013-06/BinaryFile.xsd | 0 .../{released-schema => schemas}/2013-06/ROI.xsd | 0 .../{released-schema => schemas}/2013-06/SA.xsd | 0 .../{released-schema => schemas}/2013-06/SPW.xsd | 0 .../2013-06/catalog.xml | 0 .../{released-schema => schemas}/2013-06/ome.xsd | 0 .../2015-01/BinaryFile.xsd | 0 .../{released-schema => schemas}/2015-01/ROI.xsd | 0 .../{released-schema => schemas}/2015-01/SA.xsd | 0 .../{released-schema => schemas}/2015-01/SPW.xsd | 0 .../2015-01/catalog.xml | 0 .../{released-schema => schemas}/2015-01/ome.xsd | 0 .../2016-06/catalog.xml | 0 .../{released-schema => schemas}/2016-06/ome.xsd | 0 .../{released-schema => schemas}/catalog.xml | 0 .../external/XMLSchema.xsd | 0 .../external/catalog.xml | 0 .../{released-schema => schemas}/external/xml.xsd | 0 140 files changed, 18 insertions(+), 18 deletions(-) rename specification/src/main/resources/{released-schema => schemas}/2003-FC/AnalysisChain.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-FC/AnalysisModule.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-FC/BinaryFile.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-FC/CA.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-FC/CLI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-FC/DataHistory.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-FC/MLI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-FC/STD.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-FC/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-FC/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-IR1/DataHistory.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-IR1/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-IR2/DataHistory.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-IR2/MLI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-IR2/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-IR3/AnalysisModule.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-IR3/DataHistory.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-IR3/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC1/AnalysisChain.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC1/AnalysisModule.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC1/BinaryFile.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC1/CA.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC1/CLI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC1/STD.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC1/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC2/STD.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC2/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC2/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC3/STD.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC3/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC3/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC4/STD.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC4/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC4/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC5/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC5/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC6/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2003-RC6/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2007-06/AnalysisChain.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2007-06/AnalysisModule.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2007-06/BinaryFile.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2007-06/CA.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2007-06/CLI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2007-06/DataHistory.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2007-06/MLI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2007-06/SPW.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2007-06/STD.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2007-06/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2007-06/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-02/AnalysisChain.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-02/AnalysisModule.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-02/BinaryFile.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-02/CA.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-02/CLI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-02/DataHistory.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-02/MLI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-02/SPW.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-02/STD.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-02/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-02/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-04/Editor.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-04/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-09/AnalysisChain.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-09/AnalysisModule.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-09/BinaryFile.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-09/CA.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-09/CLI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-09/DataHistory.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-09/MLI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-09/OMERO.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-09/SA.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-09/SPW.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-09/STD.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-09/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2008-09/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2009-09/AnalysisChain.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2009-09/AnalysisModule.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2009-09/BinaryFile.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2009-09/CA.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2009-09/CLI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2009-09/DataHistory.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2009-09/MLI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2009-09/OMERO.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2009-09/ROI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2009-09/SA.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2009-09/SPW.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2009-09/STD.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2009-09/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2009-09/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2010-04/BinaryFile.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2010-04/OMERO.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2010-04/ROI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2010-04/SA.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2010-04/SPW.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2010-04/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2010-04/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2010-06/BinaryFile.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2010-06/OMERO.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2010-06/ROI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2010-06/SA.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2010-06/SPW.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2010-06/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2010-06/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2011-06/BinaryFile.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2011-06/OMERO.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2011-06/ROI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2011-06/SA.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2011-06/SPW.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2011-06/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2011-06/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2012-06/BinaryFile.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2012-06/ROI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2012-06/SA.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2012-06/SPW.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2012-06/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2012-06/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2013-06/BinaryFile.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2013-06/ROI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2013-06/SA.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2013-06/SPW.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2013-06/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2013-06/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2015-01/BinaryFile.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2015-01/ROI.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2015-01/SA.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2015-01/SPW.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2015-01/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2015-01/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/2016-06/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/2016-06/ome.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/external/XMLSchema.xsd (100%) rename specification/src/main/resources/{released-schema => schemas}/external/catalog.xml (100%) rename specification/src/main/resources/{released-schema => schemas}/external/xml.xsd (100%) diff --git a/cmake/XsdFu.cmake b/cmake/XsdFu.cmake index b3eeaec8c..06ccb3d0c 100644 --- a/cmake/XsdFu.cmake +++ b/cmake/XsdFu.cmake @@ -52,7 +52,7 @@ set(XSD_FU python ${XSD_FU_SCRIPT}) set(MODEL_VERSION 2016-06) # Path to the model within the source tree -set(MODEL_PATH ${PROJECT_SOURCE_DIR}/specification/src/main/resources/released-schema/${MODEL_VERSION}) +set(MODEL_PATH ${PROJECT_SOURCE_DIR}/specification/src/main/resources/schemas/${MODEL_VERSION}) # Files to use within the model directory set(MODEL_FILES diff --git a/ome-xml/CMakeLists.txt b/ome-xml/CMakeLists.txt index 303c7c983..3324ae8f2 100644 --- a/ome-xml/CMakeLists.txt +++ b/ome-xml/CMakeLists.txt @@ -39,7 +39,7 @@ function(ome_xml_add_test) add_test(${ARGV}) set_tests_properties(${ARGV0} - PROPERTIES ENVIRONMENT "OME_XML_SCHEMADIR=${PROJECT_SOURCE_DIR}/specification/src/main/resources/released-schema;OME_XML_TRANSFORMDIR=${PROJECT_SOURCE_DIR}/specification/src/main/resources/transforms;OME_XML_SAMPLEDIR=${PROJECT_SOURCE_DIR}/specification/src/main/resources/samples") + PROPERTIES ENVIRONMENT "OME_XML_SCHEMADIR=${PROJECT_SOURCE_DIR}/specification/src/main/resources/schemas;OME_XML_TRANSFORMDIR=${PROJECT_SOURCE_DIR}/specification/src/main/resources/transforms;OME_XML_SAMPLEDIR=${PROJECT_SOURCE_DIR}/specification/src/main/resources/samples") endfunction() add_subdirectory(src/main/cpp) diff --git a/ome-xml/src/main/cpp/ome/xml/CMakeLists.txt b/ome-xml/src/main/cpp/ome/xml/CMakeLists.txt index 261889f3c..ac2060b95 100644 --- a/ome-xml/src/main/cpp/ome/xml/CMakeLists.txt +++ b/ome-xml/src/main/cpp/ome/xml/CMakeLists.txt @@ -239,15 +239,15 @@ add_custom_target(gensrc DEPENDS ${OME_XML_GENERATED_MODEL_ENUMS_HEADERS}) # Find and install all schemas -file(GLOB OME_SCHEMAS RELATIVE "${PROJECT_SOURCE_DIR}/specification/src/main/resources/released-schema/" - "${PROJECT_SOURCE_DIR}/specification/src/main/resources/released-schema/catalog.xml" - "${PROJECT_SOURCE_DIR}/specification/src/main/resources/released-schema/2*/*.xsd" - "${PROJECT_SOURCE_DIR}/specification/src/main/resources/released-schema/2*/catalog.xml" - "${PROJECT_SOURCE_DIR}/specification/src/main/resources/released-schema/external/*.xsd" - "${PROJECT_SOURCE_DIR}/specification/src/main/resources/released-schema/external/catalog.xml") +file(GLOB OME_SCHEMAS RELATIVE "${PROJECT_SOURCE_DIR}/specification/src/main/resources/schemas/" + "${PROJECT_SOURCE_DIR}/specification/src/main/resources/schemas/catalog.xml" + "${PROJECT_SOURCE_DIR}/specification/src/main/resources/schemas/2*/*.xsd" + "${PROJECT_SOURCE_DIR}/specification/src/main/resources/schemas/2*/catalog.xml" + "${PROJECT_SOURCE_DIR}/specification/src/main/resources/schemas/external/*.xsd" + "${PROJECT_SOURCE_DIR}/specification/src/main/resources/schemas/external/catalog.xml") foreach(schema ${OME_SCHEMAS}) get_filename_component(SCHEMA_RELEASE ${schema} PATH) - install(FILES "${PROJECT_SOURCE_DIR}/specification/src/main/resources/released-schema/${schema}" + install(FILES "${PROJECT_SOURCE_DIR}/specification/src/main/resources/schemas/${schema}" DESTINATION "${OME_XML_INSTALL_SCHEMADIR}/${SCHEMA_RELEASE}" COMPONENT "runtime") endforeach(schema) diff --git a/pom.xml b/pom.xml index 74d20004e..a99f2c570 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ ${ome_common.version} 2016-06 - specification/src/main/resources/released-schema/${ome.model.schemaver} + specification/src/main/resources/schemas/${ome.model.schemaver} ${ome.model.schemapath}/ome.xsd diff --git a/specification/publish b/specification/publish index 6e5701b39..2622cc5f3 100755 --- a/specification/publish +++ b/specification/publish @@ -40,7 +40,7 @@ curdate() { # Get the most recent version of a schema # $1=schema name mostrecentversion() { - echo "$(basename $(dirname $(find src/main/resources/released-schema -name "$1" | grep -v $devmarker | sort | tail -n1)))" + echo "$(basename $(dirname $(find src/main/resources/schemas -name "$1" | grep -v $devmarker | sort | tail -n1)))" } # Check if the a schema is the most recent version (return true) or legacy (return false) @@ -88,7 +88,7 @@ schemastatus() { # $1=schema name # $2=release to check if current schemaversion() { - version=$(grep "version=" "src/main/resources/released-schema/$2/$1" | grep -v 'xml' | head -n1 | sed -e 's;^.*version="\([0-9][0-9]*\)".*$;\1;') + version=$(grep "version=" "src/main/resources/schemas/$2/$1" | grep -v 'xml' | head -n1 | sed -e 's;^.*version="\([0-9][0-9]*\)".*$;\1;') if [ -z "$version" ]; then version="1" fi @@ -155,7 +155,7 @@ root=target/published rm -rf "$root" mkdir -p "$root" -for dir in src/main/resources/released-schema/20* +for dir in src/main/resources/schemas/20* do if contains $dir $devmarker; then @@ -407,11 +407,11 @@ the
    EOF - for release in $(ls -1d src/main/resources/released-schema/20* | grep -v 2003 | grep -v $devmarker | xargs $XARGSOPTS -n1 basename | sort -r); do + for release in $(ls -1d src/main/resources/schemas/20* | grep -v 2003 | grep -v $devmarker | xargs $XARGSOPTS -n1 basename | sort -r); do reldate=$(parsedate "$release") echo "
  • $reldate - namespace /$release/
    • " done - for release in $(ls -1d src/main/resources/released-schema/20* | grep 2003 | xargs $XARGSOPTS -n1 basename | sort -r | grep FC | sed -e 's;2003-\(.*\);\1;') $(ls -1d src/main/resources/released-schema/20* | grep 2003 | xargs $XARGSOPTS -n1 basename | sort -r | grep -v FC | sed -e 's;2003-\(.*\);\1;'); do + for release in $(ls -1d src/main/resources/schemas/20* | grep 2003 | xargs $XARGSOPTS -n1 basename | sort -r | grep FC | sed -e 's;2003-\(.*\);\1;') $(ls -1d src/main/resources/schemas/20* | grep 2003 | xargs $XARGSOPTS -n1 basename | sort -r | grep -v FC | sed -e 's;2003-\(.*\);\1;'); do reldate="2003 ($release)" echo "
  • $reldate - namespace /$release/*.xsd
    • " done diff --git a/specification/src/main/java/ome/specification/SchemaResolver.java b/specification/src/main/java/ome/specification/SchemaResolver.java index 827df21b5..87b97d07a 100644 --- a/specification/src/main/java/ome/specification/SchemaResolver.java +++ b/specification/src/main/java/ome/specification/SchemaResolver.java @@ -57,7 +57,7 @@ public class SchemaResolver implements LSResourceResolver private static String GIT_MASTER_PATH = "http://git.openmicroscopy.org/src/master/components/specification"; private static String GIT_DEVELOP_PATH = "http://git.openmicroscopy.org/src/develop/components/specification"; private static String MAIN_PATH = "http://www.openmicroscopy.org/Schemas/"; - private static String MAIN_SEARCH_PATH = "/released-schema/"; + private static String MAIN_SEARCH_PATH = "/schemas/"; private static String LEGACY_AC_PATH = "http://www.openmicroscopy.org/XMLschemas/AnalysisChain/RC1/"; private static String LEGACY_AM_PATH = "http://www.openmicroscopy.org/XMLschemas/AnalysisModule/RC1/"; private static String LEGACY_BF_PATH = "http://www.openmicroscopy.org/XMLschemas/BinaryFile/RC1/"; @@ -67,7 +67,7 @@ public class SchemaResolver implements LSResourceResolver private static String LEGACY_ML_PATH = "http://www.openmicroscopy.org/XMLschemas/MLI/IR2/"; private static String LEGACY_OM_PATH = "http://www.openmicroscopy.org/XMLschemas/OME/FC/"; private static String LEGACY_ST_PATH = "http://www.openmicroscopy.org/XMLschemas/STD/RC2/"; - private static String LEGACY_SEARCH_PATH = "/released-schema/2003-FC/"; + private static String LEGACY_SEARCH_PATH = "/schemas/2003-FC/"; public SchemaResolver() throws ClassNotFoundException, InstantiationException, IllegalAccessException { @@ -136,7 +136,7 @@ public LSInput resolveResource( // Match the requested schema locations and create the appropriate LSInput object if (systemId.equals("http://www.w3.org/2001/xml.xsd")) { - theResult = makeSubstutionStream("/released-schema/external/xml.xsd", systemId); + theResult = makeSubstutionStream("/schemas/external/xml.xsd", systemId); } else if (systemId.startsWith(GIT_MASTER_PATH)) { diff --git a/specification/src/main/resources/released-schema/2003-FC/AnalysisChain.xsd b/specification/src/main/resources/schemas/2003-FC/AnalysisChain.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-FC/AnalysisChain.xsd rename to specification/src/main/resources/schemas/2003-FC/AnalysisChain.xsd diff --git a/specification/src/main/resources/released-schema/2003-FC/AnalysisModule.xsd b/specification/src/main/resources/schemas/2003-FC/AnalysisModule.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-FC/AnalysisModule.xsd rename to specification/src/main/resources/schemas/2003-FC/AnalysisModule.xsd diff --git a/specification/src/main/resources/released-schema/2003-FC/BinaryFile.xsd b/specification/src/main/resources/schemas/2003-FC/BinaryFile.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-FC/BinaryFile.xsd rename to specification/src/main/resources/schemas/2003-FC/BinaryFile.xsd diff --git a/specification/src/main/resources/released-schema/2003-FC/CA.xsd b/specification/src/main/resources/schemas/2003-FC/CA.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-FC/CA.xsd rename to specification/src/main/resources/schemas/2003-FC/CA.xsd diff --git a/specification/src/main/resources/released-schema/2003-FC/CLI.xsd b/specification/src/main/resources/schemas/2003-FC/CLI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-FC/CLI.xsd rename to specification/src/main/resources/schemas/2003-FC/CLI.xsd diff --git a/specification/src/main/resources/released-schema/2003-FC/DataHistory.xsd b/specification/src/main/resources/schemas/2003-FC/DataHistory.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-FC/DataHistory.xsd rename to specification/src/main/resources/schemas/2003-FC/DataHistory.xsd diff --git a/specification/src/main/resources/released-schema/2003-FC/MLI.xsd b/specification/src/main/resources/schemas/2003-FC/MLI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-FC/MLI.xsd rename to specification/src/main/resources/schemas/2003-FC/MLI.xsd diff --git a/specification/src/main/resources/released-schema/2003-FC/STD.xsd b/specification/src/main/resources/schemas/2003-FC/STD.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-FC/STD.xsd rename to specification/src/main/resources/schemas/2003-FC/STD.xsd diff --git a/specification/src/main/resources/released-schema/2003-FC/catalog.xml b/specification/src/main/resources/schemas/2003-FC/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2003-FC/catalog.xml rename to specification/src/main/resources/schemas/2003-FC/catalog.xml diff --git a/specification/src/main/resources/released-schema/2003-FC/ome.xsd b/specification/src/main/resources/schemas/2003-FC/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-FC/ome.xsd rename to specification/src/main/resources/schemas/2003-FC/ome.xsd diff --git a/specification/src/main/resources/released-schema/2003-IR1/DataHistory.xsd b/specification/src/main/resources/schemas/2003-IR1/DataHistory.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-IR1/DataHistory.xsd rename to specification/src/main/resources/schemas/2003-IR1/DataHistory.xsd diff --git a/specification/src/main/resources/released-schema/2003-IR1/catalog.xml b/specification/src/main/resources/schemas/2003-IR1/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2003-IR1/catalog.xml rename to specification/src/main/resources/schemas/2003-IR1/catalog.xml diff --git a/specification/src/main/resources/released-schema/2003-IR2/DataHistory.xsd b/specification/src/main/resources/schemas/2003-IR2/DataHistory.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-IR2/DataHistory.xsd rename to specification/src/main/resources/schemas/2003-IR2/DataHistory.xsd diff --git a/specification/src/main/resources/released-schema/2003-IR2/MLI.xsd b/specification/src/main/resources/schemas/2003-IR2/MLI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-IR2/MLI.xsd rename to specification/src/main/resources/schemas/2003-IR2/MLI.xsd diff --git a/specification/src/main/resources/released-schema/2003-IR2/catalog.xml b/specification/src/main/resources/schemas/2003-IR2/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2003-IR2/catalog.xml rename to specification/src/main/resources/schemas/2003-IR2/catalog.xml diff --git a/specification/src/main/resources/released-schema/2003-IR3/AnalysisModule.xsd b/specification/src/main/resources/schemas/2003-IR3/AnalysisModule.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-IR3/AnalysisModule.xsd rename to specification/src/main/resources/schemas/2003-IR3/AnalysisModule.xsd diff --git a/specification/src/main/resources/released-schema/2003-IR3/DataHistory.xsd b/specification/src/main/resources/schemas/2003-IR3/DataHistory.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-IR3/DataHistory.xsd rename to specification/src/main/resources/schemas/2003-IR3/DataHistory.xsd diff --git a/specification/src/main/resources/released-schema/2003-IR3/catalog.xml b/specification/src/main/resources/schemas/2003-IR3/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2003-IR3/catalog.xml rename to specification/src/main/resources/schemas/2003-IR3/catalog.xml diff --git a/specification/src/main/resources/released-schema/2003-RC1/AnalysisChain.xsd b/specification/src/main/resources/schemas/2003-RC1/AnalysisChain.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC1/AnalysisChain.xsd rename to specification/src/main/resources/schemas/2003-RC1/AnalysisChain.xsd diff --git a/specification/src/main/resources/released-schema/2003-RC1/AnalysisModule.xsd b/specification/src/main/resources/schemas/2003-RC1/AnalysisModule.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC1/AnalysisModule.xsd rename to specification/src/main/resources/schemas/2003-RC1/AnalysisModule.xsd diff --git a/specification/src/main/resources/released-schema/2003-RC1/BinaryFile.xsd b/specification/src/main/resources/schemas/2003-RC1/BinaryFile.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC1/BinaryFile.xsd rename to specification/src/main/resources/schemas/2003-RC1/BinaryFile.xsd diff --git a/specification/src/main/resources/released-schema/2003-RC1/CA.xsd b/specification/src/main/resources/schemas/2003-RC1/CA.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC1/CA.xsd rename to specification/src/main/resources/schemas/2003-RC1/CA.xsd diff --git a/specification/src/main/resources/released-schema/2003-RC1/CLI.xsd b/specification/src/main/resources/schemas/2003-RC1/CLI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC1/CLI.xsd rename to specification/src/main/resources/schemas/2003-RC1/CLI.xsd diff --git a/specification/src/main/resources/released-schema/2003-RC1/STD.xsd b/specification/src/main/resources/schemas/2003-RC1/STD.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC1/STD.xsd rename to specification/src/main/resources/schemas/2003-RC1/STD.xsd diff --git a/specification/src/main/resources/released-schema/2003-RC1/catalog.xml b/specification/src/main/resources/schemas/2003-RC1/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC1/catalog.xml rename to specification/src/main/resources/schemas/2003-RC1/catalog.xml diff --git a/specification/src/main/resources/released-schema/2003-RC2/STD.xsd b/specification/src/main/resources/schemas/2003-RC2/STD.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC2/STD.xsd rename to specification/src/main/resources/schemas/2003-RC2/STD.xsd diff --git a/specification/src/main/resources/released-schema/2003-RC2/catalog.xml b/specification/src/main/resources/schemas/2003-RC2/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC2/catalog.xml rename to specification/src/main/resources/schemas/2003-RC2/catalog.xml diff --git a/specification/src/main/resources/released-schema/2003-RC2/ome.xsd b/specification/src/main/resources/schemas/2003-RC2/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC2/ome.xsd rename to specification/src/main/resources/schemas/2003-RC2/ome.xsd diff --git a/specification/src/main/resources/released-schema/2003-RC3/STD.xsd b/specification/src/main/resources/schemas/2003-RC3/STD.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC3/STD.xsd rename to specification/src/main/resources/schemas/2003-RC3/STD.xsd diff --git a/specification/src/main/resources/released-schema/2003-RC3/catalog.xml b/specification/src/main/resources/schemas/2003-RC3/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC3/catalog.xml rename to specification/src/main/resources/schemas/2003-RC3/catalog.xml diff --git a/specification/src/main/resources/released-schema/2003-RC3/ome.xsd b/specification/src/main/resources/schemas/2003-RC3/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC3/ome.xsd rename to specification/src/main/resources/schemas/2003-RC3/ome.xsd diff --git a/specification/src/main/resources/released-schema/2003-RC4/STD.xsd b/specification/src/main/resources/schemas/2003-RC4/STD.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC4/STD.xsd rename to specification/src/main/resources/schemas/2003-RC4/STD.xsd diff --git a/specification/src/main/resources/released-schema/2003-RC4/catalog.xml b/specification/src/main/resources/schemas/2003-RC4/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC4/catalog.xml rename to specification/src/main/resources/schemas/2003-RC4/catalog.xml diff --git a/specification/src/main/resources/released-schema/2003-RC4/ome.xsd b/specification/src/main/resources/schemas/2003-RC4/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC4/ome.xsd rename to specification/src/main/resources/schemas/2003-RC4/ome.xsd diff --git a/specification/src/main/resources/released-schema/2003-RC5/catalog.xml b/specification/src/main/resources/schemas/2003-RC5/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC5/catalog.xml rename to specification/src/main/resources/schemas/2003-RC5/catalog.xml diff --git a/specification/src/main/resources/released-schema/2003-RC5/ome.xsd b/specification/src/main/resources/schemas/2003-RC5/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC5/ome.xsd rename to specification/src/main/resources/schemas/2003-RC5/ome.xsd diff --git a/specification/src/main/resources/released-schema/2003-RC6/catalog.xml b/specification/src/main/resources/schemas/2003-RC6/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC6/catalog.xml rename to specification/src/main/resources/schemas/2003-RC6/catalog.xml diff --git a/specification/src/main/resources/released-schema/2003-RC6/ome.xsd b/specification/src/main/resources/schemas/2003-RC6/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2003-RC6/ome.xsd rename to specification/src/main/resources/schemas/2003-RC6/ome.xsd diff --git a/specification/src/main/resources/released-schema/2007-06/AnalysisChain.xsd b/specification/src/main/resources/schemas/2007-06/AnalysisChain.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2007-06/AnalysisChain.xsd rename to specification/src/main/resources/schemas/2007-06/AnalysisChain.xsd diff --git a/specification/src/main/resources/released-schema/2007-06/AnalysisModule.xsd b/specification/src/main/resources/schemas/2007-06/AnalysisModule.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2007-06/AnalysisModule.xsd rename to specification/src/main/resources/schemas/2007-06/AnalysisModule.xsd diff --git a/specification/src/main/resources/released-schema/2007-06/BinaryFile.xsd b/specification/src/main/resources/schemas/2007-06/BinaryFile.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2007-06/BinaryFile.xsd rename to specification/src/main/resources/schemas/2007-06/BinaryFile.xsd diff --git a/specification/src/main/resources/released-schema/2007-06/CA.xsd b/specification/src/main/resources/schemas/2007-06/CA.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2007-06/CA.xsd rename to specification/src/main/resources/schemas/2007-06/CA.xsd diff --git a/specification/src/main/resources/released-schema/2007-06/CLI.xsd b/specification/src/main/resources/schemas/2007-06/CLI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2007-06/CLI.xsd rename to specification/src/main/resources/schemas/2007-06/CLI.xsd diff --git a/specification/src/main/resources/released-schema/2007-06/DataHistory.xsd b/specification/src/main/resources/schemas/2007-06/DataHistory.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2007-06/DataHistory.xsd rename to specification/src/main/resources/schemas/2007-06/DataHistory.xsd diff --git a/specification/src/main/resources/released-schema/2007-06/MLI.xsd b/specification/src/main/resources/schemas/2007-06/MLI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2007-06/MLI.xsd rename to specification/src/main/resources/schemas/2007-06/MLI.xsd diff --git a/specification/src/main/resources/released-schema/2007-06/SPW.xsd b/specification/src/main/resources/schemas/2007-06/SPW.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2007-06/SPW.xsd rename to specification/src/main/resources/schemas/2007-06/SPW.xsd diff --git a/specification/src/main/resources/released-schema/2007-06/STD.xsd b/specification/src/main/resources/schemas/2007-06/STD.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2007-06/STD.xsd rename to specification/src/main/resources/schemas/2007-06/STD.xsd diff --git a/specification/src/main/resources/released-schema/2007-06/catalog.xml b/specification/src/main/resources/schemas/2007-06/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2007-06/catalog.xml rename to specification/src/main/resources/schemas/2007-06/catalog.xml diff --git a/specification/src/main/resources/released-schema/2007-06/ome.xsd b/specification/src/main/resources/schemas/2007-06/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2007-06/ome.xsd rename to specification/src/main/resources/schemas/2007-06/ome.xsd diff --git a/specification/src/main/resources/released-schema/2008-02/AnalysisChain.xsd b/specification/src/main/resources/schemas/2008-02/AnalysisChain.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-02/AnalysisChain.xsd rename to specification/src/main/resources/schemas/2008-02/AnalysisChain.xsd diff --git a/specification/src/main/resources/released-schema/2008-02/AnalysisModule.xsd b/specification/src/main/resources/schemas/2008-02/AnalysisModule.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-02/AnalysisModule.xsd rename to specification/src/main/resources/schemas/2008-02/AnalysisModule.xsd diff --git a/specification/src/main/resources/released-schema/2008-02/BinaryFile.xsd b/specification/src/main/resources/schemas/2008-02/BinaryFile.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-02/BinaryFile.xsd rename to specification/src/main/resources/schemas/2008-02/BinaryFile.xsd diff --git a/specification/src/main/resources/released-schema/2008-02/CA.xsd b/specification/src/main/resources/schemas/2008-02/CA.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-02/CA.xsd rename to specification/src/main/resources/schemas/2008-02/CA.xsd diff --git a/specification/src/main/resources/released-schema/2008-02/CLI.xsd b/specification/src/main/resources/schemas/2008-02/CLI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-02/CLI.xsd rename to specification/src/main/resources/schemas/2008-02/CLI.xsd diff --git a/specification/src/main/resources/released-schema/2008-02/DataHistory.xsd b/specification/src/main/resources/schemas/2008-02/DataHistory.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-02/DataHistory.xsd rename to specification/src/main/resources/schemas/2008-02/DataHistory.xsd diff --git a/specification/src/main/resources/released-schema/2008-02/MLI.xsd b/specification/src/main/resources/schemas/2008-02/MLI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-02/MLI.xsd rename to specification/src/main/resources/schemas/2008-02/MLI.xsd diff --git a/specification/src/main/resources/released-schema/2008-02/SPW.xsd b/specification/src/main/resources/schemas/2008-02/SPW.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-02/SPW.xsd rename to specification/src/main/resources/schemas/2008-02/SPW.xsd diff --git a/specification/src/main/resources/released-schema/2008-02/STD.xsd b/specification/src/main/resources/schemas/2008-02/STD.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-02/STD.xsd rename to specification/src/main/resources/schemas/2008-02/STD.xsd diff --git a/specification/src/main/resources/released-schema/2008-02/catalog.xml b/specification/src/main/resources/schemas/2008-02/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2008-02/catalog.xml rename to specification/src/main/resources/schemas/2008-02/catalog.xml diff --git a/specification/src/main/resources/released-schema/2008-02/ome.xsd b/specification/src/main/resources/schemas/2008-02/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-02/ome.xsd rename to specification/src/main/resources/schemas/2008-02/ome.xsd diff --git a/specification/src/main/resources/released-schema/2008-04/Editor.xsd b/specification/src/main/resources/schemas/2008-04/Editor.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-04/Editor.xsd rename to specification/src/main/resources/schemas/2008-04/Editor.xsd diff --git a/specification/src/main/resources/released-schema/2008-04/catalog.xml b/specification/src/main/resources/schemas/2008-04/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2008-04/catalog.xml rename to specification/src/main/resources/schemas/2008-04/catalog.xml diff --git a/specification/src/main/resources/released-schema/2008-09/AnalysisChain.xsd b/specification/src/main/resources/schemas/2008-09/AnalysisChain.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-09/AnalysisChain.xsd rename to specification/src/main/resources/schemas/2008-09/AnalysisChain.xsd diff --git a/specification/src/main/resources/released-schema/2008-09/AnalysisModule.xsd b/specification/src/main/resources/schemas/2008-09/AnalysisModule.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-09/AnalysisModule.xsd rename to specification/src/main/resources/schemas/2008-09/AnalysisModule.xsd diff --git a/specification/src/main/resources/released-schema/2008-09/BinaryFile.xsd b/specification/src/main/resources/schemas/2008-09/BinaryFile.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-09/BinaryFile.xsd rename to specification/src/main/resources/schemas/2008-09/BinaryFile.xsd diff --git a/specification/src/main/resources/released-schema/2008-09/CA.xsd b/specification/src/main/resources/schemas/2008-09/CA.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-09/CA.xsd rename to specification/src/main/resources/schemas/2008-09/CA.xsd diff --git a/specification/src/main/resources/released-schema/2008-09/CLI.xsd b/specification/src/main/resources/schemas/2008-09/CLI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-09/CLI.xsd rename to specification/src/main/resources/schemas/2008-09/CLI.xsd diff --git a/specification/src/main/resources/released-schema/2008-09/DataHistory.xsd b/specification/src/main/resources/schemas/2008-09/DataHistory.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-09/DataHistory.xsd rename to specification/src/main/resources/schemas/2008-09/DataHistory.xsd diff --git a/specification/src/main/resources/released-schema/2008-09/MLI.xsd b/specification/src/main/resources/schemas/2008-09/MLI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-09/MLI.xsd rename to specification/src/main/resources/schemas/2008-09/MLI.xsd diff --git a/specification/src/main/resources/released-schema/2008-09/OMERO.xsd b/specification/src/main/resources/schemas/2008-09/OMERO.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-09/OMERO.xsd rename to specification/src/main/resources/schemas/2008-09/OMERO.xsd diff --git a/specification/src/main/resources/released-schema/2008-09/SA.xsd b/specification/src/main/resources/schemas/2008-09/SA.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-09/SA.xsd rename to specification/src/main/resources/schemas/2008-09/SA.xsd diff --git a/specification/src/main/resources/released-schema/2008-09/SPW.xsd b/specification/src/main/resources/schemas/2008-09/SPW.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-09/SPW.xsd rename to specification/src/main/resources/schemas/2008-09/SPW.xsd diff --git a/specification/src/main/resources/released-schema/2008-09/STD.xsd b/specification/src/main/resources/schemas/2008-09/STD.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-09/STD.xsd rename to specification/src/main/resources/schemas/2008-09/STD.xsd diff --git a/specification/src/main/resources/released-schema/2008-09/catalog.xml b/specification/src/main/resources/schemas/2008-09/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2008-09/catalog.xml rename to specification/src/main/resources/schemas/2008-09/catalog.xml diff --git a/specification/src/main/resources/released-schema/2008-09/ome.xsd b/specification/src/main/resources/schemas/2008-09/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2008-09/ome.xsd rename to specification/src/main/resources/schemas/2008-09/ome.xsd diff --git a/specification/src/main/resources/released-schema/2009-09/AnalysisChain.xsd b/specification/src/main/resources/schemas/2009-09/AnalysisChain.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2009-09/AnalysisChain.xsd rename to specification/src/main/resources/schemas/2009-09/AnalysisChain.xsd diff --git a/specification/src/main/resources/released-schema/2009-09/AnalysisModule.xsd b/specification/src/main/resources/schemas/2009-09/AnalysisModule.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2009-09/AnalysisModule.xsd rename to specification/src/main/resources/schemas/2009-09/AnalysisModule.xsd diff --git a/specification/src/main/resources/released-schema/2009-09/BinaryFile.xsd b/specification/src/main/resources/schemas/2009-09/BinaryFile.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2009-09/BinaryFile.xsd rename to specification/src/main/resources/schemas/2009-09/BinaryFile.xsd diff --git a/specification/src/main/resources/released-schema/2009-09/CA.xsd b/specification/src/main/resources/schemas/2009-09/CA.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2009-09/CA.xsd rename to specification/src/main/resources/schemas/2009-09/CA.xsd diff --git a/specification/src/main/resources/released-schema/2009-09/CLI.xsd b/specification/src/main/resources/schemas/2009-09/CLI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2009-09/CLI.xsd rename to specification/src/main/resources/schemas/2009-09/CLI.xsd diff --git a/specification/src/main/resources/released-schema/2009-09/DataHistory.xsd b/specification/src/main/resources/schemas/2009-09/DataHistory.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2009-09/DataHistory.xsd rename to specification/src/main/resources/schemas/2009-09/DataHistory.xsd diff --git a/specification/src/main/resources/released-schema/2009-09/MLI.xsd b/specification/src/main/resources/schemas/2009-09/MLI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2009-09/MLI.xsd rename to specification/src/main/resources/schemas/2009-09/MLI.xsd diff --git a/specification/src/main/resources/released-schema/2009-09/OMERO.xsd b/specification/src/main/resources/schemas/2009-09/OMERO.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2009-09/OMERO.xsd rename to specification/src/main/resources/schemas/2009-09/OMERO.xsd diff --git a/specification/src/main/resources/released-schema/2009-09/ROI.xsd b/specification/src/main/resources/schemas/2009-09/ROI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2009-09/ROI.xsd rename to specification/src/main/resources/schemas/2009-09/ROI.xsd diff --git a/specification/src/main/resources/released-schema/2009-09/SA.xsd b/specification/src/main/resources/schemas/2009-09/SA.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2009-09/SA.xsd rename to specification/src/main/resources/schemas/2009-09/SA.xsd diff --git a/specification/src/main/resources/released-schema/2009-09/SPW.xsd b/specification/src/main/resources/schemas/2009-09/SPW.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2009-09/SPW.xsd rename to specification/src/main/resources/schemas/2009-09/SPW.xsd diff --git a/specification/src/main/resources/released-schema/2009-09/STD.xsd b/specification/src/main/resources/schemas/2009-09/STD.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2009-09/STD.xsd rename to specification/src/main/resources/schemas/2009-09/STD.xsd diff --git a/specification/src/main/resources/released-schema/2009-09/catalog.xml b/specification/src/main/resources/schemas/2009-09/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2009-09/catalog.xml rename to specification/src/main/resources/schemas/2009-09/catalog.xml diff --git a/specification/src/main/resources/released-schema/2009-09/ome.xsd b/specification/src/main/resources/schemas/2009-09/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2009-09/ome.xsd rename to specification/src/main/resources/schemas/2009-09/ome.xsd diff --git a/specification/src/main/resources/released-schema/2010-04/BinaryFile.xsd b/specification/src/main/resources/schemas/2010-04/BinaryFile.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2010-04/BinaryFile.xsd rename to specification/src/main/resources/schemas/2010-04/BinaryFile.xsd diff --git a/specification/src/main/resources/released-schema/2010-04/OMERO.xsd b/specification/src/main/resources/schemas/2010-04/OMERO.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2010-04/OMERO.xsd rename to specification/src/main/resources/schemas/2010-04/OMERO.xsd diff --git a/specification/src/main/resources/released-schema/2010-04/ROI.xsd b/specification/src/main/resources/schemas/2010-04/ROI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2010-04/ROI.xsd rename to specification/src/main/resources/schemas/2010-04/ROI.xsd diff --git a/specification/src/main/resources/released-schema/2010-04/SA.xsd b/specification/src/main/resources/schemas/2010-04/SA.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2010-04/SA.xsd rename to specification/src/main/resources/schemas/2010-04/SA.xsd diff --git a/specification/src/main/resources/released-schema/2010-04/SPW.xsd b/specification/src/main/resources/schemas/2010-04/SPW.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2010-04/SPW.xsd rename to specification/src/main/resources/schemas/2010-04/SPW.xsd diff --git a/specification/src/main/resources/released-schema/2010-04/catalog.xml b/specification/src/main/resources/schemas/2010-04/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2010-04/catalog.xml rename to specification/src/main/resources/schemas/2010-04/catalog.xml diff --git a/specification/src/main/resources/released-schema/2010-04/ome.xsd b/specification/src/main/resources/schemas/2010-04/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2010-04/ome.xsd rename to specification/src/main/resources/schemas/2010-04/ome.xsd diff --git a/specification/src/main/resources/released-schema/2010-06/BinaryFile.xsd b/specification/src/main/resources/schemas/2010-06/BinaryFile.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2010-06/BinaryFile.xsd rename to specification/src/main/resources/schemas/2010-06/BinaryFile.xsd diff --git a/specification/src/main/resources/released-schema/2010-06/OMERO.xsd b/specification/src/main/resources/schemas/2010-06/OMERO.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2010-06/OMERO.xsd rename to specification/src/main/resources/schemas/2010-06/OMERO.xsd diff --git a/specification/src/main/resources/released-schema/2010-06/ROI.xsd b/specification/src/main/resources/schemas/2010-06/ROI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2010-06/ROI.xsd rename to specification/src/main/resources/schemas/2010-06/ROI.xsd diff --git a/specification/src/main/resources/released-schema/2010-06/SA.xsd b/specification/src/main/resources/schemas/2010-06/SA.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2010-06/SA.xsd rename to specification/src/main/resources/schemas/2010-06/SA.xsd diff --git a/specification/src/main/resources/released-schema/2010-06/SPW.xsd b/specification/src/main/resources/schemas/2010-06/SPW.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2010-06/SPW.xsd rename to specification/src/main/resources/schemas/2010-06/SPW.xsd diff --git a/specification/src/main/resources/released-schema/2010-06/catalog.xml b/specification/src/main/resources/schemas/2010-06/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2010-06/catalog.xml rename to specification/src/main/resources/schemas/2010-06/catalog.xml diff --git a/specification/src/main/resources/released-schema/2010-06/ome.xsd b/specification/src/main/resources/schemas/2010-06/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2010-06/ome.xsd rename to specification/src/main/resources/schemas/2010-06/ome.xsd diff --git a/specification/src/main/resources/released-schema/2011-06/BinaryFile.xsd b/specification/src/main/resources/schemas/2011-06/BinaryFile.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2011-06/BinaryFile.xsd rename to specification/src/main/resources/schemas/2011-06/BinaryFile.xsd diff --git a/specification/src/main/resources/released-schema/2011-06/OMERO.xsd b/specification/src/main/resources/schemas/2011-06/OMERO.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2011-06/OMERO.xsd rename to specification/src/main/resources/schemas/2011-06/OMERO.xsd diff --git a/specification/src/main/resources/released-schema/2011-06/ROI.xsd b/specification/src/main/resources/schemas/2011-06/ROI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2011-06/ROI.xsd rename to specification/src/main/resources/schemas/2011-06/ROI.xsd diff --git a/specification/src/main/resources/released-schema/2011-06/SA.xsd b/specification/src/main/resources/schemas/2011-06/SA.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2011-06/SA.xsd rename to specification/src/main/resources/schemas/2011-06/SA.xsd diff --git a/specification/src/main/resources/released-schema/2011-06/SPW.xsd b/specification/src/main/resources/schemas/2011-06/SPW.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2011-06/SPW.xsd rename to specification/src/main/resources/schemas/2011-06/SPW.xsd diff --git a/specification/src/main/resources/released-schema/2011-06/catalog.xml b/specification/src/main/resources/schemas/2011-06/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2011-06/catalog.xml rename to specification/src/main/resources/schemas/2011-06/catalog.xml diff --git a/specification/src/main/resources/released-schema/2011-06/ome.xsd b/specification/src/main/resources/schemas/2011-06/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2011-06/ome.xsd rename to specification/src/main/resources/schemas/2011-06/ome.xsd diff --git a/specification/src/main/resources/released-schema/2012-06/BinaryFile.xsd b/specification/src/main/resources/schemas/2012-06/BinaryFile.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2012-06/BinaryFile.xsd rename to specification/src/main/resources/schemas/2012-06/BinaryFile.xsd diff --git a/specification/src/main/resources/released-schema/2012-06/ROI.xsd b/specification/src/main/resources/schemas/2012-06/ROI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2012-06/ROI.xsd rename to specification/src/main/resources/schemas/2012-06/ROI.xsd diff --git a/specification/src/main/resources/released-schema/2012-06/SA.xsd b/specification/src/main/resources/schemas/2012-06/SA.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2012-06/SA.xsd rename to specification/src/main/resources/schemas/2012-06/SA.xsd diff --git a/specification/src/main/resources/released-schema/2012-06/SPW.xsd b/specification/src/main/resources/schemas/2012-06/SPW.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2012-06/SPW.xsd rename to specification/src/main/resources/schemas/2012-06/SPW.xsd diff --git a/specification/src/main/resources/released-schema/2012-06/catalog.xml b/specification/src/main/resources/schemas/2012-06/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2012-06/catalog.xml rename to specification/src/main/resources/schemas/2012-06/catalog.xml diff --git a/specification/src/main/resources/released-schema/2012-06/ome.xsd b/specification/src/main/resources/schemas/2012-06/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2012-06/ome.xsd rename to specification/src/main/resources/schemas/2012-06/ome.xsd diff --git a/specification/src/main/resources/released-schema/2013-06/BinaryFile.xsd b/specification/src/main/resources/schemas/2013-06/BinaryFile.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2013-06/BinaryFile.xsd rename to specification/src/main/resources/schemas/2013-06/BinaryFile.xsd diff --git a/specification/src/main/resources/released-schema/2013-06/ROI.xsd b/specification/src/main/resources/schemas/2013-06/ROI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2013-06/ROI.xsd rename to specification/src/main/resources/schemas/2013-06/ROI.xsd diff --git a/specification/src/main/resources/released-schema/2013-06/SA.xsd b/specification/src/main/resources/schemas/2013-06/SA.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2013-06/SA.xsd rename to specification/src/main/resources/schemas/2013-06/SA.xsd diff --git a/specification/src/main/resources/released-schema/2013-06/SPW.xsd b/specification/src/main/resources/schemas/2013-06/SPW.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2013-06/SPW.xsd rename to specification/src/main/resources/schemas/2013-06/SPW.xsd diff --git a/specification/src/main/resources/released-schema/2013-06/catalog.xml b/specification/src/main/resources/schemas/2013-06/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2013-06/catalog.xml rename to specification/src/main/resources/schemas/2013-06/catalog.xml diff --git a/specification/src/main/resources/released-schema/2013-06/ome.xsd b/specification/src/main/resources/schemas/2013-06/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2013-06/ome.xsd rename to specification/src/main/resources/schemas/2013-06/ome.xsd diff --git a/specification/src/main/resources/released-schema/2015-01/BinaryFile.xsd b/specification/src/main/resources/schemas/2015-01/BinaryFile.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2015-01/BinaryFile.xsd rename to specification/src/main/resources/schemas/2015-01/BinaryFile.xsd diff --git a/specification/src/main/resources/released-schema/2015-01/ROI.xsd b/specification/src/main/resources/schemas/2015-01/ROI.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2015-01/ROI.xsd rename to specification/src/main/resources/schemas/2015-01/ROI.xsd diff --git a/specification/src/main/resources/released-schema/2015-01/SA.xsd b/specification/src/main/resources/schemas/2015-01/SA.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2015-01/SA.xsd rename to specification/src/main/resources/schemas/2015-01/SA.xsd diff --git a/specification/src/main/resources/released-schema/2015-01/SPW.xsd b/specification/src/main/resources/schemas/2015-01/SPW.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2015-01/SPW.xsd rename to specification/src/main/resources/schemas/2015-01/SPW.xsd diff --git a/specification/src/main/resources/released-schema/2015-01/catalog.xml b/specification/src/main/resources/schemas/2015-01/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2015-01/catalog.xml rename to specification/src/main/resources/schemas/2015-01/catalog.xml diff --git a/specification/src/main/resources/released-schema/2015-01/ome.xsd b/specification/src/main/resources/schemas/2015-01/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2015-01/ome.xsd rename to specification/src/main/resources/schemas/2015-01/ome.xsd diff --git a/specification/src/main/resources/released-schema/2016-06/catalog.xml b/specification/src/main/resources/schemas/2016-06/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/2016-06/catalog.xml rename to specification/src/main/resources/schemas/2016-06/catalog.xml diff --git a/specification/src/main/resources/released-schema/2016-06/ome.xsd b/specification/src/main/resources/schemas/2016-06/ome.xsd similarity index 100% rename from specification/src/main/resources/released-schema/2016-06/ome.xsd rename to specification/src/main/resources/schemas/2016-06/ome.xsd diff --git a/specification/src/main/resources/released-schema/catalog.xml b/specification/src/main/resources/schemas/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/catalog.xml rename to specification/src/main/resources/schemas/catalog.xml diff --git a/specification/src/main/resources/released-schema/external/XMLSchema.xsd b/specification/src/main/resources/schemas/external/XMLSchema.xsd similarity index 100% rename from specification/src/main/resources/released-schema/external/XMLSchema.xsd rename to specification/src/main/resources/schemas/external/XMLSchema.xsd diff --git a/specification/src/main/resources/released-schema/external/catalog.xml b/specification/src/main/resources/schemas/external/catalog.xml similarity index 100% rename from specification/src/main/resources/released-schema/external/catalog.xml rename to specification/src/main/resources/schemas/external/catalog.xml diff --git a/specification/src/main/resources/released-schema/external/xml.xsd b/specification/src/main/resources/schemas/external/xml.xsd similarity index 100% rename from specification/src/main/resources/released-schema/external/xml.xsd rename to specification/src/main/resources/schemas/external/xml.xsd