From c2db3ae4fec218a64f712bb3e7fa1ae69a545210 Mon Sep 17 00:00:00 2001 From: utas-raymondng Date: Thu, 14 Mar 2024 14:30:01 +1100 Subject: [PATCH 1/5] Refactor to submodules --- geonetwork/pom.xml | 63 +++ .../main/resources/iso19115_3_2018/README.md | 0 .../iso19115_3_2018/iso19115-3.2018.xjb | 0 .../iso19115_3_2018/iso19115-3.2018.xsd | 0 .../others/ISO19136/SchematronConstraints.xml | 0 .../schema/others/ISO19136/basicTypes.xsd | 0 .../others/ISO19136/coordinateOperations.xsd | 0 .../ISO19136/coordinateReferenceSystems.xsd | 0 .../others/ISO19136/coordinateSystems.xsd | 0 .../schema/others/ISO19136/coverage.xsd | 0 .../schema/others/ISO19136/datums.xsd | 0 .../schema/others/ISO19136/defaultStyle.xsd | 0 .../others/ISO19136/deprecatedTypes.xsd | 0 .../schema/others/ISO19136/dictionary.xsd | 0 .../schema/others/ISO19136/direction.xsd | 0 .../schema/others/ISO19136/dynamicFeature.xsd | 0 .../schema/others/ISO19136/feature.xsd | 0 .../others/ISO19136/geometryAggregates.xsd | 0 .../others/ISO19136/geometryBasic0d1d.xsd | 0 .../others/ISO19136/geometryBasic2d.xsd | 0 .../others/ISO19136/geometryComplexes.xsd | 0 .../others/ISO19136/geometryPrimitives.xsd | 0 .../schema/others/ISO19136/gml.xsd | 0 .../schema/others/ISO19136/gmlBase.xsd | 0 .../others/ISO19136/gml_3_2_1-ReadMe.txt | 0 .../schema/others/ISO19136/grids.xsd | 0 .../schema/others/ISO19136/measures.xsd | 0 .../schema/others/ISO19136/observation.xsd | 0 .../others/ISO19136/referenceSystems.xsd | 0 .../schema/others/ISO19136/temporal.xsd | 0 .../ISO19136/temporalReferenceSystems.xsd | 0 .../others/ISO19136/temporalTopology.xsd | 0 .../schema/others/ISO19136/topology.xsd | 0 .../schema/others/ISO19136/units.xsd | 0 .../schema/others/ISO19136/valueObjects.xsd | 0 .../schema/others/xlink/xlink.xsd | 0 .../schema/others/xlink/xml.xsd | 0 .../19110/fcc/1.0/abstract.xsd | 0 .../standards.iso.org/19110/fcc/1.0/fcc.xsd | 0 .../19110/gfc/1.1/featureCatalogue.xsd | 0 .../standards.iso.org/19110/gfc/1.1/gfc.xsd | 0 .../-2/gmi/1.0/acquisitionInformation.xsd | 0 .../19115/-2/gmi/1.0/contentInformation.xsd | 0 .../-2/gmi/1.0/dataQualityInformation.xsd | 0 .../19115/-2/gmi/1.0/gmi.xsd | 0 .../19115/-2/gmi/1.0/metadataEntitySet.xsd | 0 .../1.0/spatialRepresentationInformation.xsd | 0 .../19115/-3/cat/1.0/cat.xsd | 0 .../19115/-3/cat/1.0/catalogues.xsd | 0 .../19115/-3/cat/1.0/codelistItem.xsd | 0 .../19115/-3/cat/1.0/crsItem.xsd | 0 .../19115/-3/cat/1.0/uomItem.xsd | 0 .../19115/-3/cit/1.0/cit.sch | 0 .../19115/-3/cit/1.0/cit.xsd | 0 .../19115/-3/cit/1.0/citation.xsd | 0 .../19115/-3/cit/2.0/cit.xsd | 0 .../19115/-3/cit/2.0/citation.xsd | 0 .../19115/-3/gco/1.0/baseTypes2014.xsd | 0 .../19115/-3/gco/1.0/gco.xsd | 0 .../19115/-3/gcx/1.0/extendedTypes.xsd | 0 .../1.0/extendedTypes_autoFromShapeChange.xsd | 0 .../19115/-3/gcx/1.0/gcx.xsd | 0 .../19115/-3/gex/1.0/extent.xsd | 0 .../19115/-3/gex/1.0/gex.sch | 0 .../19115/-3/gex/1.0/gex.xsd | 0 .../19115/-3/gmw/1.0/gmlWrapperTypes2014.xsd | 0 .../19115/-3/gmw/1.0/gmw.xsd | 0 .../19115/-3/lan/1.0/lan.xsd | 0 .../19115/-3/lan/1.0/language.xsd | 0 .../mac/1.0/acquisitionInformationImagery.xsd | 0 .../19115/-3/mac/1.0/mac.xsd | 0 .../mac/2.0/acquisitionInformationImagery.xsd | 0 .../19115/-3/mac/2.0/event.xsd | 0 .../19115/-3/mac/2.0/mac.xsd | 0 .../19115/-3/mas/1.0/applicationSchema.xsd | 0 .../19115/-3/mas/1.0/mas.xsd | 0 .../-3/mcc/1.0/AbstractCommonClasses.xsd | 0 .../19115/-3/mcc/1.0/commonClasses.xsd | 0 .../19115/-3/mcc/1.0/mcc.xsd | 0 .../19115/-3/mco/1.0/constraints.xsd | 0 .../19115/-3/mco/1.0/mco.sch | 0 .../19115/-3/mco/1.0/mco.xsd | 0 .../19115/-3/md1/1.0/md1.xsd | 0 .../-3/md1/1.0/metadataWExtendedType.xsd | 0 .../19115/-3/md2/1.0/md2.xsd | 0 .../-3/md2/1.0/metadataWithExtensions.xsd | 0 .../19115/-3/mda/1.0/mda.xsd | 0 .../19115/-3/mda/1.0/metadataApplication.xsd | 0 .../19115/-3/mdb/1.0/mdb.sch | 0 .../19115/-3/mdb/1.0/mdb.xsd | 0 .../19115/-3/mdb/1.0/metadataBase.xsd | 0 .../19115/-3/mdb/2.0/mdb.sch | 0 .../19115/-3/mdb/2.0/mdb.xsd | 0 .../19115/-3/mdb/2.0/metadataBase.xsd | 0 .../19115/-3/mds/1.0/mds.xsd | 0 .../19115/-3/mds/1.0/metadataDataServices.xsd | 0 .../19115/-3/mdt/1.0/mdt.xsd | 0 .../19115/-3/mdt/1.0/metadataTransfer.xsd | 0 .../19115/-3/mex/1.0/metadataExtension.xsd | 0 .../19115/-3/mex/1.0/mex.sch | 0 .../19115/-3/mex/1.0/mex.xsd | 0 .../19115/-3/mmi/1.0/maintenance.xsd | 0 .../19115/-3/mmi/1.0/mmi.sch | 0 .../19115/-3/mmi/1.0/mmi.xsd | 0 .../19115/-3/mpc/1.0/mpc.xsd | 0 .../19115/-3/mpc/1.0/portrayalCatalogue.xsd | 0 .../19115/-3/mrc/1.0/content.xsd | 0 .../-3/mrc/1.0/contentInformationImagery.xsd | 0 .../19115/-3/mrc/1.0/mrc.sch | 0 .../19115/-3/mrc/1.0/mrc.xsd | 0 .../19115/-3/mrc/2.0/content.xsd | 0 .../-3/mrc/2.0/contentInformationImagery.xsd | 0 .../19115/-3/mrc/2.0/mrc.xsd | 0 .../19115/-3/mrd/1.0/distribution.xsd | 0 .../19115/-3/mrd/1.0/mrd.sch | 0 .../19115/-3/mrd/1.0/mrd.xsd | 0 .../19115/-3/mri/1.0/identification.xsd | 0 .../19115/-3/mri/1.0/mri.sch | 0 .../19115/-3/mri/1.0/mri.xsd | 0 .../19115/-3/mrl/1.0/lineage.xsd | 0 .../19115/-3/mrl/1.0/lineageImagery.xsd | 0 .../19115/-3/mrl/1.0/mrl.xsd | 0 .../19115/-3/mrl/2.0/lineage.xsd | 0 .../19115/-3/mrl/2.0/lineageImagery.xsd | 0 .../19115/-3/mrl/2.0/mrl.xsd | 0 .../19115/-3/mrs/1.0/mrs.sch | 0 .../19115/-3/mrs/1.0/mrs.xsd | 0 .../19115/-3/mrs/1.0/referenceSystem.xsd | 0 .../19115/-3/msr/1.0/msr.xsd | 0 .../-3/msr/1.0/spatialRepresentation.xsd | 0 .../msr/1.0/spatialRepresentationImagery.xsd | 0 .../19115/-3/msr/2.0/msr.xsd | 0 .../-3/msr/2.0/spatialRepresentation.xsd | 0 .../msr/2.0/spatialRepresentationImagery.xsd | 0 .../19115/-3/srv/2.0/serviceInformation.xsd | 0 .../19115/-3/srv/2.0/srv.sch | 0 .../19115/-3/srv/2.0/srv.xsd | 0 .../19115/-3/srv/2.1/serviceInformation.xsd | 0 .../19115/-3/srv/2.1/srv.xsd | 0 .../Codelists/gml/CodelistDictionary-v32.xsl | 0 .../makeNamespaceTable.xsl | 0 .../writeHTMLFiles.xsl | 0 .../transforms/CT_CodelistCatalougue2HTML.xsl | 0 .../transforms/ISO19139/fromISO19139.xsl | 0 .../ISO19139/mapping/CI_Citation.xsl | 0 .../ISO19139/mapping/CI_ResponsibleParty.xsl | 0 .../transforms/ISO19139/mapping/DQ.xsl | 0 .../transforms/ISO19139/mapping/SRV.xsl | 0 .../transforms/ISO19139/mapping/core.xsl | 0 .../transforms/ISO19139/mapping/defaults.xsl | 0 .../transforms/ISO19139/toISO19139.xsl | 0 .../utility/create19115-3Namespaces.xsl | 0 .../transforms/ISO19139/utility/dateTime.xsl | 0 .../utility/multiLingualCharacterStrings.xsl | 0 .../19135/-2/pre/1.0/abstract.xsd | 0 .../19135/-2/pre/1.0/pre.xsd | 0 .../19135/-2/reg/1.0/reg.xsd | 0 .../19135/-2/reg/1.0/registration.xsd | 0 .../standards.iso.org/19155/gpi/1.0/gpi.xsd | 0 .../19155/gpi/1.0/placeIdentifier.xsd | 0 .../gpi/1.0/sampleGMLApplicationSchema.xsd | 0 .../19157/-2/dqc/1.0/abstract.xsd | 0 .../19157/-2/dqc/1.0/dqc.xsd | 0 .../19157/-2/dqm/1.0/dqm.sch | 0 .../19157/-2/dqm/1.0/dqm.xsd | 0 .../19157/-2/dqm/1.0/qualityMeasures.xsd | 0 .../19157/-2/mdq/1.0/dataQualityElement.xsd | 0 .../-2/mdq/1.0/dataQualityEvaluation.xsd | 0 .../19157/-2/mdq/1.0/dataQualityImagery.xsd | 0 .../19157/-2/mdq/1.0/dataQualityResult.xsd | 0 .../19157/-2/mdq/1.0/mdq.sch | 0 .../19157/-2/mdq/1.0/mdq.xsd | 0 .../19157/-2/mdq/1.0/metaquality.xsd | 0 .../1.0/geospatialPreservationMetadata.xsd | 0 .../standards.iso.org/19165/gpm/1.0/gpm.xsd | 0 indexer/pom.xml | 235 +++++++++++ .../au/org/aodn/esindexer/Application.java | 0 .../esindexer/configuration/AppConstants.java | 2 - .../configuration/ElasticSearchConfig.java | 0 .../configuration/GeoNetworkSearchConfig.java | 0 .../esindexer/configuration/JaxbConfig.java | 0 .../configuration/ObjectMapperConfig.java | 0 .../configuration/OpenAPIConfig.java | 0 .../configuration/SecurityConfig.java | 6 +- .../esindexer/configuration/WebMvcConfig.java | 0 .../controller/IndexerController.java | 0 .../exception/CreateIndexException.java | 0 .../exception/DeleteIndexException.java | 0 .../exception/DocumentNotFoundException.java | 0 .../GNConnectionRefusedException.java | 0 .../IndexAllRequestNotConfirmedException.java | 0 .../exception/IndexNotFoundException.java | 0 .../exception/IndexingRecordException.java | 0 .../exception/MappingValueException.java | 0 .../exception/MetadataNotFoundException.java | 0 .../MetadataUnpublishedException.java | 0 .../esindexer/security/APIKeyAuthFilter.java | 0 .../security/JwtAuthenticationEntryPoint.java | 0 .../esindexer/service/GeoNetworkService.java | 0 .../service/GeoNetworkServiceImpl.java | 2 +- .../esindexer/service/IndexerService.java | 0 .../esindexer/service/IndexerServiceImpl.java | 6 +- .../esindexer/service/RankingService.java | 2 +- .../esindexer/service/RankingServiceImpl.java | 2 +- .../service/StacCollectionMapperService.java | 8 +- .../org/aodn/esindexer/utils/BBoxUtils.java | 0 .../aodn/esindexer/utils/GeometryBase.java | 5 - .../aodn/esindexer/utils/GeometryUtils.java | 1 - .../org/aodn/esindexer/utils/JaxbUtils.java | 0 .../org/aodn/esindexer/utils/StacUtils.java | 0 .../org/aodn/esindexer/utils/StringUtil.java | 0 .../aodn/esindexer/utils/TemporalUtils.java | 0 .../src}/main/resources/application-dev.yaml | 0 .../src}/main/resources/application.yaml | 0 .../portal_records_index_schema.json | 0 .../au/org/aodn/esindexer/BaseTestClass.java | 0 .../ElasticSearchTestConfig.java | 0 .../GeoNetworkSearchTestConfig.java | 0 .../service/GeoNetworkServiceTests.java | 0 .../service/IndexerServiceTests.java | 1 - .../service/RankingServiceTests.java | 13 +- .../aodn/esindexer/utils/StringUtilTest.java | 1 + .../src}/test/resources/application-test.yaml | 0 .../src}/test/resources/canned/sample1.xml | 0 .../src}/test/resources/canned/sample2.xml | 0 .../src}/test/resources/canned/sample3.xml | 0 .../test/resources/canned/sample3_stac.json | 0 .../src}/test/resources/canned/sample4.xml | 0 .../resources/canned/transformed_sample2.xml | 0 .../src}/test/resources/compose-gn4-test.yml | 0 pom.xml | 383 ++++++------------ stacmodel/pom.xml | 31 ++ .../aodn/stac/configuration/AppConstants.java | 9 + .../org/aodn/stac}/model/ContactsModel.java | 2 +- .../au/org/aodn/stac}/model/ExtentModel.java | 2 +- .../org/aodn/stac}/model/LanguageModel.java | 2 +- .../au/org/aodn/stac}/model/LinkModel.java | 2 +- .../org/aodn/stac}/model/ProviderModel.java | 2 +- .../aodn/stac}/model/StacCollectionModel.java | 4 +- .../org/aodn/stac}/model/SummariesModel.java | 2 +- .../au/org/aodn/stac}/model/ThemesModel.java | 2 +- 241 files changed, 496 insertions(+), 292 deletions(-) create mode 100644 geonetwork/pom.xml rename {src => geonetwork/src}/main/resources/iso19115_3_2018/README.md (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/iso19115-3.2018.xjb (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/iso19115-3.2018.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/SchematronConstraints.xml (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/basicTypes.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/coordinateOperations.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/coordinateReferenceSystems.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/coordinateSystems.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/coverage.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/datums.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/defaultStyle.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/deprecatedTypes.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/dictionary.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/direction.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/dynamicFeature.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/feature.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryAggregates.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryBasic0d1d.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryBasic2d.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryComplexes.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryPrimitives.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/gml.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/gmlBase.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/gml_3_2_1-ReadMe.txt (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/grids.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/measures.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/observation.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/referenceSystems.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/temporal.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/temporalReferenceSystems.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/temporalTopology.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/topology.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/units.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/ISO19136/valueObjects.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/xlink/xlink.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/others/xlink/xml.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/fcc/1.0/abstract.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/fcc/1.0/fcc.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/gfc/1.1/featureCatalogue.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/gfc/1.1/gfc.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/acquisitionInformation.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/contentInformation.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/dataQualityInformation.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/gmi.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/metadataEntitySet.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/spatialRepresentationInformation.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/cat.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/catalogues.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/codelistItem.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/crsItem.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/uomItem.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/1.0/cit.sch (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/1.0/cit.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/1.0/citation.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/2.0/cit.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/2.0/citation.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gco/1.0/baseTypes2014.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gco/1.0/gco.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gcx/1.0/extendedTypes.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gcx/1.0/extendedTypes_autoFromShapeChange.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gcx/1.0/gcx.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gex/1.0/extent.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gex/1.0/gex.sch (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gex/1.0/gex.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gmw/1.0/gmlWrapperTypes2014.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gmw/1.0/gmw.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/lan/1.0/lan.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/lan/1.0/language.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/1.0/acquisitionInformationImagery.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/1.0/mac.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/2.0/acquisitionInformationImagery.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/2.0/event.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/2.0/mac.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mas/1.0/applicationSchema.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mas/1.0/mas.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mcc/1.0/AbstractCommonClasses.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mcc/1.0/commonClasses.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mcc/1.0/mcc.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mco/1.0/constraints.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mco/1.0/mco.sch (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mco/1.0/mco.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md1/1.0/md1.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md1/1.0/metadataWExtendedType.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md2/1.0/md2.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md2/1.0/metadataWithExtensions.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mda/1.0/mda.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mda/1.0/metadataApplication.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/1.0/mdb.sch (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/1.0/mdb.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/1.0/metadataBase.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/2.0/mdb.sch (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/2.0/mdb.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/2.0/metadataBase.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mds/1.0/mds.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mds/1.0/metadataDataServices.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdt/1.0/mdt.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdt/1.0/metadataTransfer.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mex/1.0/metadataExtension.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mex/1.0/mex.sch (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mex/1.0/mex.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mmi/1.0/maintenance.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mmi/1.0/mmi.sch (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mmi/1.0/mmi.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mpc/1.0/mpc.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mpc/1.0/portrayalCatalogue.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/content.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/contentInformationImagery.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/mrc.sch (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/mrc.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/2.0/content.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/2.0/contentInformationImagery.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/2.0/mrc.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrd/1.0/distribution.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrd/1.0/mrd.sch (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrd/1.0/mrd.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mri/1.0/identification.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mri/1.0/mri.sch (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mri/1.0/mri.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/1.0/lineage.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/1.0/lineageImagery.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/1.0/mrl.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/2.0/lineage.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/2.0/lineageImagery.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/2.0/mrl.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrs/1.0/mrs.sch (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrs/1.0/mrs.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrs/1.0/referenceSystem.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/1.0/msr.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/1.0/spatialRepresentation.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/1.0/spatialRepresentationImagery.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/2.0/msr.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/2.0/spatialRepresentation.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/2.0/spatialRepresentationImagery.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.0/serviceInformation.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.0/srv.sch (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.0/srv.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.1/serviceInformation.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.1/srv.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/Codelists/gml/CodelistDictionary-v32.xsl (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/namespaceInformationAndTools/makeNamespaceTable.xsl (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/namespaceInformationAndTools/writeHTMLFiles.xsl (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/CT_CodelistCatalougue2HTML.xsl (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/fromISO19139.xsl (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/CI_Citation.xsl (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/CI_ResponsibleParty.xsl (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/DQ.xsl (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/SRV.xsl (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/core.xsl (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/defaults.xsl (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/toISO19139.xsl (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/utility/create19115-3Namespaces.xsl (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/utility/dateTime.xsl (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/utility/multiLingualCharacterStrings.xsl (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/pre/1.0/abstract.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/pre/1.0/pre.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/reg/1.0/reg.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/reg/1.0/registration.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19155/gpi/1.0/gpi.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19155/gpi/1.0/placeIdentifier.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19155/gpi/1.0/sampleGMLApplicationSchema.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqc/1.0/abstract.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqc/1.0/dqc.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqm/1.0/dqm.sch (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqm/1.0/dqm.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqm/1.0/qualityMeasures.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityElement.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityEvaluation.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityImagery.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityResult.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/mdq.sch (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/mdq.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/metaquality.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19165/gpm/1.0/geospatialPreservationMetadata.xsd (100%) rename {src => geonetwork/src}/main/resources/iso19115_3_2018/schema/standards.iso.org/19165/gpm/1.0/gpm.xsd (100%) create mode 100644 indexer/pom.xml rename {src => indexer/src}/main/java/au/org/aodn/esindexer/Application.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/configuration/AppConstants.java (89%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/configuration/ElasticSearchConfig.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/configuration/GeoNetworkSearchConfig.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/configuration/JaxbConfig.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/configuration/ObjectMapperConfig.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/configuration/OpenAPIConfig.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/configuration/SecurityConfig.java (95%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/configuration/WebMvcConfig.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/controller/IndexerController.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/exception/CreateIndexException.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/exception/DeleteIndexException.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/exception/DocumentNotFoundException.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/exception/GNConnectionRefusedException.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/exception/IndexAllRequestNotConfirmedException.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/exception/IndexNotFoundException.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/exception/IndexingRecordException.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/exception/MappingValueException.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/exception/MetadataNotFoundException.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/exception/MetadataUnpublishedException.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/security/APIKeyAuthFilter.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/security/JwtAuthenticationEntryPoint.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/service/GeoNetworkService.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/service/GeoNetworkServiceImpl.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/service/IndexerService.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/service/IndexerServiceImpl.java (99%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/service/RankingService.java (73%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/service/RankingServiceImpl.java (98%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/service/StacCollectionMapperService.java (99%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/utils/BBoxUtils.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/utils/GeometryBase.java (96%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/utils/GeometryUtils.java (98%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/utils/JaxbUtils.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/utils/StacUtils.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/utils/StringUtil.java (100%) rename {src => indexer/src}/main/java/au/org/aodn/esindexer/utils/TemporalUtils.java (100%) rename {src => indexer/src}/main/resources/application-dev.yaml (100%) rename {src => indexer/src}/main/resources/application.yaml (100%) rename {src => indexer/src}/main/resources/config_files/portal_records_index_schema.json (100%) rename {src => indexer/src}/test/java/au/org/aodn/esindexer/BaseTestClass.java (100%) rename {src => indexer/src}/test/java/au/org/aodn/esindexer/configuration/ElasticSearchTestConfig.java (100%) rename {src => indexer/src}/test/java/au/org/aodn/esindexer/configuration/GeoNetworkSearchTestConfig.java (100%) rename {src => indexer/src}/test/java/au/org/aodn/esindexer/service/GeoNetworkServiceTests.java (100%) rename {src => indexer/src}/test/java/au/org/aodn/esindexer/service/IndexerServiceTests.java (98%) rename {src => indexer/src}/test/java/au/org/aodn/esindexer/service/RankingServiceTests.java (93%) rename {src => indexer/src}/test/java/au/org/aodn/esindexer/utils/StringUtilTest.java (97%) rename {src => indexer/src}/test/resources/application-test.yaml (100%) rename {src => indexer/src}/test/resources/canned/sample1.xml (100%) rename {src => indexer/src}/test/resources/canned/sample2.xml (100%) rename {src => indexer/src}/test/resources/canned/sample3.xml (100%) rename {src => indexer/src}/test/resources/canned/sample3_stac.json (100%) rename {src => indexer/src}/test/resources/canned/sample4.xml (100%) rename {src => indexer/src}/test/resources/canned/transformed_sample2.xml (100%) rename {src => indexer/src}/test/resources/compose-gn4-test.yml (100%) create mode 100644 stacmodel/pom.xml create mode 100644 stacmodel/src/main/java/au/org/aodn/stac/configuration/AppConstants.java rename {src/main/java/au/org/aodn/esindexer => stacmodel/src/main/java/au/org/aodn/stac}/model/ContactsModel.java (92%) rename {src/main/java/au/org/aodn/esindexer => stacmodel/src/main/java/au/org/aodn/stac}/model/ExtentModel.java (98%) rename {src/main/java/au/org/aodn/esindexer => stacmodel/src/main/java/au/org/aodn/stac}/model/LanguageModel.java (79%) rename {src/main/java/au/org/aodn/esindexer => stacmodel/src/main/java/au/org/aodn/stac}/model/LinkModel.java (84%) rename {src/main/java/au/org/aodn/esindexer => stacmodel/src/main/java/au/org/aodn/stac}/model/ProviderModel.java (86%) rename {src/main/java/au/org/aodn/esindexer => stacmodel/src/main/java/au/org/aodn/stac}/model/StacCollectionModel.java (94%) rename {src/main/java/au/org/aodn/esindexer => stacmodel/src/main/java/au/org/aodn/stac}/model/SummariesModel.java (96%) rename {src/main/java/au/org/aodn/esindexer => stacmodel/src/main/java/au/org/aodn/stac}/model/ThemesModel.java (88%) diff --git a/geonetwork/pom.xml b/geonetwork/pom.xml new file mode 100644 index 00000000..304a2b9d --- /dev/null +++ b/geonetwork/pom.xml @@ -0,0 +1,63 @@ + + + + es-indexer + au.org.aodn + 0.0.0 + ../pom.xml + + 4.0.0 + + geonetwork + + + 17 + 17 + + + + + + jakarta.xml.bind + jakarta.xml.bind-api + + + org.glassfish.jaxb + jaxb-runtime + + + + + + + org.codehaus.mojo + jaxb2-maven-plugin + 3.1.0 + + + xjc-iso19115-3.2018 + generate-sources + + xjc + + + au.org.aodn.metadata.iso19115_3_2018 + + src/main/resources/iso19115_3_2018/iso19115-3.2018.xsd + + + src/main/resources/iso19115_3_2018/iso19115-3.2018.xjb + + ${basedir}/src/main/generated + true + false + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/iso19115_3_2018/README.md b/geonetwork/src/main/resources/iso19115_3_2018/README.md similarity index 100% rename from src/main/resources/iso19115_3_2018/README.md rename to geonetwork/src/main/resources/iso19115_3_2018/README.md diff --git a/src/main/resources/iso19115_3_2018/iso19115-3.2018.xjb b/geonetwork/src/main/resources/iso19115_3_2018/iso19115-3.2018.xjb similarity index 100% rename from src/main/resources/iso19115_3_2018/iso19115-3.2018.xjb rename to geonetwork/src/main/resources/iso19115_3_2018/iso19115-3.2018.xjb diff --git a/src/main/resources/iso19115_3_2018/iso19115-3.2018.xsd b/geonetwork/src/main/resources/iso19115_3_2018/iso19115-3.2018.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/iso19115-3.2018.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/iso19115-3.2018.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/SchematronConstraints.xml b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/SchematronConstraints.xml similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/SchematronConstraints.xml rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/SchematronConstraints.xml diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/basicTypes.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/basicTypes.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/basicTypes.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/basicTypes.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/coordinateOperations.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/coordinateOperations.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/coordinateOperations.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/coordinateOperations.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/coordinateReferenceSystems.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/coordinateReferenceSystems.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/coordinateReferenceSystems.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/coordinateReferenceSystems.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/coordinateSystems.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/coordinateSystems.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/coordinateSystems.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/coordinateSystems.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/coverage.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/coverage.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/coverage.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/coverage.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/datums.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/datums.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/datums.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/datums.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/defaultStyle.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/defaultStyle.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/defaultStyle.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/defaultStyle.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/deprecatedTypes.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/deprecatedTypes.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/deprecatedTypes.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/deprecatedTypes.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/dictionary.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/dictionary.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/dictionary.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/dictionary.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/direction.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/direction.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/direction.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/direction.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/dynamicFeature.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/dynamicFeature.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/dynamicFeature.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/dynamicFeature.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/feature.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/feature.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/feature.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/feature.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryAggregates.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryAggregates.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryAggregates.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryAggregates.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryBasic0d1d.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryBasic0d1d.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryBasic0d1d.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryBasic0d1d.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryBasic2d.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryBasic2d.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryBasic2d.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryBasic2d.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryComplexes.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryComplexes.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryComplexes.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryComplexes.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryPrimitives.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryPrimitives.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryPrimitives.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/geometryPrimitives.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/gml.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/gml.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/gml.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/gml.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/gmlBase.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/gmlBase.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/gmlBase.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/gmlBase.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/gml_3_2_1-ReadMe.txt b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/gml_3_2_1-ReadMe.txt similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/gml_3_2_1-ReadMe.txt rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/gml_3_2_1-ReadMe.txt diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/grids.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/grids.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/grids.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/grids.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/measures.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/measures.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/measures.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/measures.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/observation.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/observation.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/observation.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/observation.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/referenceSystems.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/referenceSystems.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/referenceSystems.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/referenceSystems.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/temporal.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/temporal.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/temporal.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/temporal.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/temporalReferenceSystems.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/temporalReferenceSystems.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/temporalReferenceSystems.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/temporalReferenceSystems.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/temporalTopology.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/temporalTopology.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/temporalTopology.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/temporalTopology.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/topology.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/topology.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/topology.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/topology.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/units.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/units.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/units.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/units.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/ISO19136/valueObjects.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/valueObjects.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/ISO19136/valueObjects.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/ISO19136/valueObjects.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/xlink/xlink.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/xlink/xlink.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/xlink/xlink.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/xlink/xlink.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/others/xlink/xml.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/others/xlink/xml.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/others/xlink/xml.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/others/xlink/xml.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/fcc/1.0/abstract.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/fcc/1.0/abstract.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/fcc/1.0/abstract.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/fcc/1.0/abstract.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/fcc/1.0/fcc.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/fcc/1.0/fcc.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/fcc/1.0/fcc.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/fcc/1.0/fcc.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/gfc/1.1/featureCatalogue.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/gfc/1.1/featureCatalogue.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/gfc/1.1/featureCatalogue.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/gfc/1.1/featureCatalogue.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/gfc/1.1/gfc.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/gfc/1.1/gfc.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/gfc/1.1/gfc.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19110/gfc/1.1/gfc.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/acquisitionInformation.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/acquisitionInformation.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/acquisitionInformation.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/acquisitionInformation.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/contentInformation.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/contentInformation.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/contentInformation.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/contentInformation.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/dataQualityInformation.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/dataQualityInformation.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/dataQualityInformation.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/dataQualityInformation.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/gmi.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/gmi.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/gmi.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/gmi.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/metadataEntitySet.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/metadataEntitySet.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/metadataEntitySet.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/metadataEntitySet.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/spatialRepresentationInformation.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/spatialRepresentationInformation.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/spatialRepresentationInformation.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-2/gmi/1.0/spatialRepresentationInformation.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/cat.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/cat.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/cat.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/cat.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/catalogues.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/catalogues.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/catalogues.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/catalogues.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/codelistItem.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/codelistItem.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/codelistItem.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/codelistItem.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/crsItem.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/crsItem.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/crsItem.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/crsItem.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/uomItem.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/uomItem.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/uomItem.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cat/1.0/uomItem.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/1.0/cit.sch b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/1.0/cit.sch similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/1.0/cit.sch rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/1.0/cit.sch diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/1.0/cit.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/1.0/cit.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/1.0/cit.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/1.0/cit.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/1.0/citation.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/1.0/citation.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/1.0/citation.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/1.0/citation.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/2.0/cit.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/2.0/cit.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/2.0/cit.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/2.0/cit.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/2.0/citation.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/2.0/citation.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/2.0/citation.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/cit/2.0/citation.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gco/1.0/baseTypes2014.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gco/1.0/baseTypes2014.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gco/1.0/baseTypes2014.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gco/1.0/baseTypes2014.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gco/1.0/gco.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gco/1.0/gco.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gco/1.0/gco.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gco/1.0/gco.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gcx/1.0/extendedTypes.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gcx/1.0/extendedTypes.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gcx/1.0/extendedTypes.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gcx/1.0/extendedTypes.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gcx/1.0/extendedTypes_autoFromShapeChange.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gcx/1.0/extendedTypes_autoFromShapeChange.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gcx/1.0/extendedTypes_autoFromShapeChange.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gcx/1.0/extendedTypes_autoFromShapeChange.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gcx/1.0/gcx.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gcx/1.0/gcx.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gcx/1.0/gcx.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gcx/1.0/gcx.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gex/1.0/extent.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gex/1.0/extent.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gex/1.0/extent.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gex/1.0/extent.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gex/1.0/gex.sch b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gex/1.0/gex.sch similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gex/1.0/gex.sch rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gex/1.0/gex.sch diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gex/1.0/gex.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gex/1.0/gex.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gex/1.0/gex.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gex/1.0/gex.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gmw/1.0/gmlWrapperTypes2014.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gmw/1.0/gmlWrapperTypes2014.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gmw/1.0/gmlWrapperTypes2014.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gmw/1.0/gmlWrapperTypes2014.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gmw/1.0/gmw.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gmw/1.0/gmw.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gmw/1.0/gmw.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/gmw/1.0/gmw.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/lan/1.0/lan.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/lan/1.0/lan.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/lan/1.0/lan.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/lan/1.0/lan.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/lan/1.0/language.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/lan/1.0/language.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/lan/1.0/language.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/lan/1.0/language.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/1.0/acquisitionInformationImagery.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/1.0/acquisitionInformationImagery.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/1.0/acquisitionInformationImagery.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/1.0/acquisitionInformationImagery.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/1.0/mac.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/1.0/mac.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/1.0/mac.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/1.0/mac.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/2.0/acquisitionInformationImagery.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/2.0/acquisitionInformationImagery.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/2.0/acquisitionInformationImagery.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/2.0/acquisitionInformationImagery.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/2.0/event.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/2.0/event.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/2.0/event.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/2.0/event.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/2.0/mac.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/2.0/mac.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/2.0/mac.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mac/2.0/mac.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mas/1.0/applicationSchema.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mas/1.0/applicationSchema.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mas/1.0/applicationSchema.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mas/1.0/applicationSchema.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mas/1.0/mas.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mas/1.0/mas.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mas/1.0/mas.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mas/1.0/mas.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mcc/1.0/AbstractCommonClasses.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mcc/1.0/AbstractCommonClasses.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mcc/1.0/AbstractCommonClasses.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mcc/1.0/AbstractCommonClasses.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mcc/1.0/commonClasses.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mcc/1.0/commonClasses.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mcc/1.0/commonClasses.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mcc/1.0/commonClasses.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mcc/1.0/mcc.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mcc/1.0/mcc.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mcc/1.0/mcc.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mcc/1.0/mcc.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mco/1.0/constraints.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mco/1.0/constraints.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mco/1.0/constraints.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mco/1.0/constraints.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mco/1.0/mco.sch b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mco/1.0/mco.sch similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mco/1.0/mco.sch rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mco/1.0/mco.sch diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mco/1.0/mco.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mco/1.0/mco.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mco/1.0/mco.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mco/1.0/mco.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md1/1.0/md1.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md1/1.0/md1.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md1/1.0/md1.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md1/1.0/md1.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md1/1.0/metadataWExtendedType.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md1/1.0/metadataWExtendedType.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md1/1.0/metadataWExtendedType.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md1/1.0/metadataWExtendedType.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md2/1.0/md2.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md2/1.0/md2.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md2/1.0/md2.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md2/1.0/md2.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md2/1.0/metadataWithExtensions.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md2/1.0/metadataWithExtensions.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md2/1.0/metadataWithExtensions.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/md2/1.0/metadataWithExtensions.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mda/1.0/mda.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mda/1.0/mda.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mda/1.0/mda.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mda/1.0/mda.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mda/1.0/metadataApplication.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mda/1.0/metadataApplication.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mda/1.0/metadataApplication.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mda/1.0/metadataApplication.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/1.0/mdb.sch b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/1.0/mdb.sch similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/1.0/mdb.sch rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/1.0/mdb.sch diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/1.0/mdb.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/1.0/mdb.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/1.0/mdb.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/1.0/mdb.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/1.0/metadataBase.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/1.0/metadataBase.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/1.0/metadataBase.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/1.0/metadataBase.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/2.0/mdb.sch b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/2.0/mdb.sch similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/2.0/mdb.sch rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/2.0/mdb.sch diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/2.0/mdb.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/2.0/mdb.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/2.0/mdb.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/2.0/mdb.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/2.0/metadataBase.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/2.0/metadataBase.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/2.0/metadataBase.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdb/2.0/metadataBase.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mds/1.0/mds.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mds/1.0/mds.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mds/1.0/mds.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mds/1.0/mds.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mds/1.0/metadataDataServices.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mds/1.0/metadataDataServices.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mds/1.0/metadataDataServices.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mds/1.0/metadataDataServices.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdt/1.0/mdt.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdt/1.0/mdt.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdt/1.0/mdt.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdt/1.0/mdt.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdt/1.0/metadataTransfer.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdt/1.0/metadataTransfer.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdt/1.0/metadataTransfer.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mdt/1.0/metadataTransfer.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mex/1.0/metadataExtension.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mex/1.0/metadataExtension.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mex/1.0/metadataExtension.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mex/1.0/metadataExtension.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mex/1.0/mex.sch b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mex/1.0/mex.sch similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mex/1.0/mex.sch rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mex/1.0/mex.sch diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mex/1.0/mex.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mex/1.0/mex.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mex/1.0/mex.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mex/1.0/mex.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mmi/1.0/maintenance.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mmi/1.0/maintenance.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mmi/1.0/maintenance.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mmi/1.0/maintenance.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mmi/1.0/mmi.sch b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mmi/1.0/mmi.sch similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mmi/1.0/mmi.sch rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mmi/1.0/mmi.sch diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mmi/1.0/mmi.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mmi/1.0/mmi.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mmi/1.0/mmi.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mmi/1.0/mmi.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mpc/1.0/mpc.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mpc/1.0/mpc.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mpc/1.0/mpc.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mpc/1.0/mpc.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mpc/1.0/portrayalCatalogue.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mpc/1.0/portrayalCatalogue.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mpc/1.0/portrayalCatalogue.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mpc/1.0/portrayalCatalogue.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/content.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/content.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/content.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/content.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/contentInformationImagery.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/contentInformationImagery.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/contentInformationImagery.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/contentInformationImagery.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/mrc.sch b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/mrc.sch similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/mrc.sch rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/mrc.sch diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/mrc.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/mrc.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/mrc.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/1.0/mrc.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/2.0/content.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/2.0/content.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/2.0/content.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/2.0/content.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/2.0/contentInformationImagery.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/2.0/contentInformationImagery.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/2.0/contentInformationImagery.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/2.0/contentInformationImagery.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/2.0/mrc.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/2.0/mrc.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/2.0/mrc.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrc/2.0/mrc.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrd/1.0/distribution.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrd/1.0/distribution.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrd/1.0/distribution.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrd/1.0/distribution.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrd/1.0/mrd.sch b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrd/1.0/mrd.sch similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrd/1.0/mrd.sch rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrd/1.0/mrd.sch diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrd/1.0/mrd.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrd/1.0/mrd.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrd/1.0/mrd.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrd/1.0/mrd.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mri/1.0/identification.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mri/1.0/identification.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mri/1.0/identification.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mri/1.0/identification.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mri/1.0/mri.sch b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mri/1.0/mri.sch similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mri/1.0/mri.sch rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mri/1.0/mri.sch diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mri/1.0/mri.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mri/1.0/mri.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mri/1.0/mri.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mri/1.0/mri.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/1.0/lineage.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/1.0/lineage.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/1.0/lineage.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/1.0/lineage.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/1.0/lineageImagery.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/1.0/lineageImagery.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/1.0/lineageImagery.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/1.0/lineageImagery.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/1.0/mrl.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/1.0/mrl.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/1.0/mrl.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/1.0/mrl.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/2.0/lineage.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/2.0/lineage.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/2.0/lineage.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/2.0/lineage.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/2.0/lineageImagery.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/2.0/lineageImagery.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/2.0/lineageImagery.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/2.0/lineageImagery.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/2.0/mrl.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/2.0/mrl.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/2.0/mrl.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrl/2.0/mrl.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrs/1.0/mrs.sch b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrs/1.0/mrs.sch similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrs/1.0/mrs.sch rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrs/1.0/mrs.sch diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrs/1.0/mrs.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrs/1.0/mrs.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrs/1.0/mrs.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrs/1.0/mrs.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrs/1.0/referenceSystem.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrs/1.0/referenceSystem.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrs/1.0/referenceSystem.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/mrs/1.0/referenceSystem.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/1.0/msr.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/1.0/msr.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/1.0/msr.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/1.0/msr.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/1.0/spatialRepresentation.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/1.0/spatialRepresentation.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/1.0/spatialRepresentation.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/1.0/spatialRepresentation.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/1.0/spatialRepresentationImagery.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/1.0/spatialRepresentationImagery.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/1.0/spatialRepresentationImagery.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/1.0/spatialRepresentationImagery.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/2.0/msr.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/2.0/msr.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/2.0/msr.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/2.0/msr.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/2.0/spatialRepresentation.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/2.0/spatialRepresentation.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/2.0/spatialRepresentation.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/2.0/spatialRepresentation.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/2.0/spatialRepresentationImagery.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/2.0/spatialRepresentationImagery.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/2.0/spatialRepresentationImagery.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/msr/2.0/spatialRepresentationImagery.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.0/serviceInformation.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.0/serviceInformation.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.0/serviceInformation.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.0/serviceInformation.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.0/srv.sch b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.0/srv.sch similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.0/srv.sch rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.0/srv.sch diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.0/srv.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.0/srv.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.0/srv.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.0/srv.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.1/serviceInformation.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.1/serviceInformation.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.1/serviceInformation.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.1/serviceInformation.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.1/srv.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.1/srv.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.1/srv.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/-3/srv/2.1/srv.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/Codelists/gml/CodelistDictionary-v32.xsl b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/Codelists/gml/CodelistDictionary-v32.xsl similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/Codelists/gml/CodelistDictionary-v32.xsl rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/Codelists/gml/CodelistDictionary-v32.xsl diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/namespaceInformationAndTools/makeNamespaceTable.xsl b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/namespaceInformationAndTools/makeNamespaceTable.xsl similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/namespaceInformationAndTools/makeNamespaceTable.xsl rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/namespaceInformationAndTools/makeNamespaceTable.xsl diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/namespaceInformationAndTools/writeHTMLFiles.xsl b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/namespaceInformationAndTools/writeHTMLFiles.xsl similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/namespaceInformationAndTools/writeHTMLFiles.xsl rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/namespaceInformationAndTools/writeHTMLFiles.xsl diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/CT_CodelistCatalougue2HTML.xsl b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/CT_CodelistCatalougue2HTML.xsl similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/CT_CodelistCatalougue2HTML.xsl rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/CT_CodelistCatalougue2HTML.xsl diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/fromISO19139.xsl b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/fromISO19139.xsl similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/fromISO19139.xsl rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/fromISO19139.xsl diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/CI_Citation.xsl b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/CI_Citation.xsl similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/CI_Citation.xsl rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/CI_Citation.xsl diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/CI_ResponsibleParty.xsl b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/CI_ResponsibleParty.xsl similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/CI_ResponsibleParty.xsl rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/CI_ResponsibleParty.xsl diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/DQ.xsl b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/DQ.xsl similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/DQ.xsl rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/DQ.xsl diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/SRV.xsl b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/SRV.xsl similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/SRV.xsl rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/SRV.xsl diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/core.xsl b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/core.xsl similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/core.xsl rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/core.xsl diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/defaults.xsl b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/defaults.xsl similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/defaults.xsl rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/mapping/defaults.xsl diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/toISO19139.xsl b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/toISO19139.xsl similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/toISO19139.xsl rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/toISO19139.xsl diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/utility/create19115-3Namespaces.xsl b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/utility/create19115-3Namespaces.xsl similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/utility/create19115-3Namespaces.xsl rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/utility/create19115-3Namespaces.xsl diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/utility/dateTime.xsl b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/utility/dateTime.xsl similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/utility/dateTime.xsl rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/utility/dateTime.xsl diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/utility/multiLingualCharacterStrings.xsl b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/utility/multiLingualCharacterStrings.xsl similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/utility/multiLingualCharacterStrings.xsl rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/utility/multiLingualCharacterStrings.xsl diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/pre/1.0/abstract.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/pre/1.0/abstract.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/pre/1.0/abstract.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/pre/1.0/abstract.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/pre/1.0/pre.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/pre/1.0/pre.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/pre/1.0/pre.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/pre/1.0/pre.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/reg/1.0/reg.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/reg/1.0/reg.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/reg/1.0/reg.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/reg/1.0/reg.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/reg/1.0/registration.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/reg/1.0/registration.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/reg/1.0/registration.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19135/-2/reg/1.0/registration.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19155/gpi/1.0/gpi.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19155/gpi/1.0/gpi.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19155/gpi/1.0/gpi.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19155/gpi/1.0/gpi.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19155/gpi/1.0/placeIdentifier.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19155/gpi/1.0/placeIdentifier.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19155/gpi/1.0/placeIdentifier.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19155/gpi/1.0/placeIdentifier.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19155/gpi/1.0/sampleGMLApplicationSchema.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19155/gpi/1.0/sampleGMLApplicationSchema.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19155/gpi/1.0/sampleGMLApplicationSchema.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19155/gpi/1.0/sampleGMLApplicationSchema.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqc/1.0/abstract.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqc/1.0/abstract.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqc/1.0/abstract.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqc/1.0/abstract.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqc/1.0/dqc.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqc/1.0/dqc.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqc/1.0/dqc.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqc/1.0/dqc.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqm/1.0/dqm.sch b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqm/1.0/dqm.sch similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqm/1.0/dqm.sch rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqm/1.0/dqm.sch diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqm/1.0/dqm.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqm/1.0/dqm.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqm/1.0/dqm.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqm/1.0/dqm.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqm/1.0/qualityMeasures.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqm/1.0/qualityMeasures.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqm/1.0/qualityMeasures.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/dqm/1.0/qualityMeasures.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityElement.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityElement.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityElement.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityElement.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityEvaluation.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityEvaluation.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityEvaluation.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityEvaluation.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityImagery.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityImagery.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityImagery.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityImagery.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityResult.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityResult.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityResult.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/dataQualityResult.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/mdq.sch b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/mdq.sch similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/mdq.sch rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/mdq.sch diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/mdq.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/mdq.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/mdq.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/mdq.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/metaquality.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/metaquality.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/metaquality.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19157/-2/mdq/1.0/metaquality.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19165/gpm/1.0/geospatialPreservationMetadata.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19165/gpm/1.0/geospatialPreservationMetadata.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19165/gpm/1.0/geospatialPreservationMetadata.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19165/gpm/1.0/geospatialPreservationMetadata.xsd diff --git a/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19165/gpm/1.0/gpm.xsd b/geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19165/gpm/1.0/gpm.xsd similarity index 100% rename from src/main/resources/iso19115_3_2018/schema/standards.iso.org/19165/gpm/1.0/gpm.xsd rename to geonetwork/src/main/resources/iso19115_3_2018/schema/standards.iso.org/19165/gpm/1.0/gpm.xsd diff --git a/indexer/pom.xml b/indexer/pom.xml new file mode 100644 index 00000000..1b8a6569 --- /dev/null +++ b/indexer/pom.xml @@ -0,0 +1,235 @@ + + + + es-indexer + au.org.aodn + 0.0.0 + ../pom.xml + + 4.0.0 + + indexer + + + 17 + 17 + + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-data-rest + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + commons-codec + commons-codec + + + + commons-io + commons-io + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-web-services + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-cache + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-devtools + + + jakarta.activation + jakarta.activation-api + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + + + + io.jsonwebtoken + jjwt-api + + + io.jsonwebtoken + jjwt-impl + runtime + + + io.jsonwebtoken + jjwt-jackson + runtime + + + + co.elastic.clients + elasticsearch-java + + + + jakarta.xml.bind + jakarta.xml.bind-api + + + org.glassfish.jaxb + jaxb-runtime + + + org.mapstruct + mapstruct + + + org.geotools + gt-main + + + org.geotools + gt-geometry + + + org.geotools + gt-referencing + + + + org.geotools + gt-epsg-hsql + + + org.geotools + gt-geojson + + + + javax.annotation + javax.annotation-api + + + + junit + junit + test + + + org.springframework.boot + spring-boot-starter-test + test + + + com.vaadin.external.google + android-json + + + + + org.springframework.security + spring-security-test + test + + + org.testcontainers + elasticsearch + test + + + org.testcontainers + testcontainers + test + + + javax.xml.bind + jaxb-api + test + + + au.org.aodn + geonetwork + ${parent.version} + + + au.org.aodn + stacmodel + ${parent.version} + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 17 + 17 + + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} + + + + org.projectlombok + lombok + ${org.projectlombok.version} + + + + org.projectlombok + lombok-mapstruct-binding + 0.2.0 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + au.org.aodn.au.org.aodn.esindexer.Application + + + + + + + + \ No newline at end of file diff --git a/src/main/java/au/org/aodn/esindexer/Application.java b/indexer/src/main/java/au/org/aodn/esindexer/Application.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/Application.java rename to indexer/src/main/java/au/org/aodn/esindexer/Application.java diff --git a/src/main/java/au/org/aodn/esindexer/configuration/AppConstants.java b/indexer/src/main/java/au/org/aodn/esindexer/configuration/AppConstants.java similarity index 89% rename from src/main/java/au/org/aodn/esindexer/configuration/AppConstants.java rename to indexer/src/main/java/au/org/aodn/esindexer/configuration/AppConstants.java index ad7829bc..0916e35c 100644 --- a/src/main/java/au/org/aodn/esindexer/configuration/AppConstants.java +++ b/indexer/src/main/java/au/org/aodn/esindexer/configuration/AppConstants.java @@ -5,8 +5,6 @@ public interface AppConstants { String PORTAL_RECORDS_MAPPING_JSON_FILE = "portal_records_index_schema.json"; - String STAC_VERSION = "1.0.0"; - String STAC_TYPE = "Collection"; String RECOMMENDED_LINK_REL_TYPE = "self"; diff --git a/src/main/java/au/org/aodn/esindexer/configuration/ElasticSearchConfig.java b/indexer/src/main/java/au/org/aodn/esindexer/configuration/ElasticSearchConfig.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/configuration/ElasticSearchConfig.java rename to indexer/src/main/java/au/org/aodn/esindexer/configuration/ElasticSearchConfig.java diff --git a/src/main/java/au/org/aodn/esindexer/configuration/GeoNetworkSearchConfig.java b/indexer/src/main/java/au/org/aodn/esindexer/configuration/GeoNetworkSearchConfig.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/configuration/GeoNetworkSearchConfig.java rename to indexer/src/main/java/au/org/aodn/esindexer/configuration/GeoNetworkSearchConfig.java diff --git a/src/main/java/au/org/aodn/esindexer/configuration/JaxbConfig.java b/indexer/src/main/java/au/org/aodn/esindexer/configuration/JaxbConfig.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/configuration/JaxbConfig.java rename to indexer/src/main/java/au/org/aodn/esindexer/configuration/JaxbConfig.java diff --git a/src/main/java/au/org/aodn/esindexer/configuration/ObjectMapperConfig.java b/indexer/src/main/java/au/org/aodn/esindexer/configuration/ObjectMapperConfig.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/configuration/ObjectMapperConfig.java rename to indexer/src/main/java/au/org/aodn/esindexer/configuration/ObjectMapperConfig.java diff --git a/src/main/java/au/org/aodn/esindexer/configuration/OpenAPIConfig.java b/indexer/src/main/java/au/org/aodn/esindexer/configuration/OpenAPIConfig.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/configuration/OpenAPIConfig.java rename to indexer/src/main/java/au/org/aodn/esindexer/configuration/OpenAPIConfig.java diff --git a/src/main/java/au/org/aodn/esindexer/configuration/SecurityConfig.java b/indexer/src/main/java/au/org/aodn/esindexer/configuration/SecurityConfig.java similarity index 95% rename from src/main/java/au/org/aodn/esindexer/configuration/SecurityConfig.java rename to indexer/src/main/java/au/org/aodn/esindexer/configuration/SecurityConfig.java index 2f3ab2c8..f4d2e642 100644 --- a/src/main/java/au/org/aodn/esindexer/configuration/SecurityConfig.java +++ b/indexer/src/main/java/au/org/aodn/esindexer/configuration/SecurityConfig.java @@ -1,10 +1,10 @@ package au.org.aodn.esindexer.configuration; import au.org.aodn.esindexer.security.APIKeyAuthFilter; +import au.org.aodn.esindexer.security.JwtAuthenticationEntryPoint; + import java.util.Objects; -import au.org.aodn.esindexer.security.JwtAuthenticationEntryPoint; -import jakarta.servlet.Filter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -12,13 +12,11 @@ import org.springframework.core.annotation.Order; import org.springframework.http.HttpMethod; import org.springframework.security.authentication.BadCredentialsException; -import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import static org.springframework.security.config.Customizer.withDefaults; import static org.springframework.security.web.util.matcher.AntPathRequestMatcher.antMatcher; diff --git a/src/main/java/au/org/aodn/esindexer/configuration/WebMvcConfig.java b/indexer/src/main/java/au/org/aodn/esindexer/configuration/WebMvcConfig.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/configuration/WebMvcConfig.java rename to indexer/src/main/java/au/org/aodn/esindexer/configuration/WebMvcConfig.java diff --git a/src/main/java/au/org/aodn/esindexer/controller/IndexerController.java b/indexer/src/main/java/au/org/aodn/esindexer/controller/IndexerController.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/controller/IndexerController.java rename to indexer/src/main/java/au/org/aodn/esindexer/controller/IndexerController.java diff --git a/src/main/java/au/org/aodn/esindexer/exception/CreateIndexException.java b/indexer/src/main/java/au/org/aodn/esindexer/exception/CreateIndexException.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/exception/CreateIndexException.java rename to indexer/src/main/java/au/org/aodn/esindexer/exception/CreateIndexException.java diff --git a/src/main/java/au/org/aodn/esindexer/exception/DeleteIndexException.java b/indexer/src/main/java/au/org/aodn/esindexer/exception/DeleteIndexException.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/exception/DeleteIndexException.java rename to indexer/src/main/java/au/org/aodn/esindexer/exception/DeleteIndexException.java diff --git a/src/main/java/au/org/aodn/esindexer/exception/DocumentNotFoundException.java b/indexer/src/main/java/au/org/aodn/esindexer/exception/DocumentNotFoundException.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/exception/DocumentNotFoundException.java rename to indexer/src/main/java/au/org/aodn/esindexer/exception/DocumentNotFoundException.java diff --git a/src/main/java/au/org/aodn/esindexer/exception/GNConnectionRefusedException.java b/indexer/src/main/java/au/org/aodn/esindexer/exception/GNConnectionRefusedException.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/exception/GNConnectionRefusedException.java rename to indexer/src/main/java/au/org/aodn/esindexer/exception/GNConnectionRefusedException.java diff --git a/src/main/java/au/org/aodn/esindexer/exception/IndexAllRequestNotConfirmedException.java b/indexer/src/main/java/au/org/aodn/esindexer/exception/IndexAllRequestNotConfirmedException.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/exception/IndexAllRequestNotConfirmedException.java rename to indexer/src/main/java/au/org/aodn/esindexer/exception/IndexAllRequestNotConfirmedException.java diff --git a/src/main/java/au/org/aodn/esindexer/exception/IndexNotFoundException.java b/indexer/src/main/java/au/org/aodn/esindexer/exception/IndexNotFoundException.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/exception/IndexNotFoundException.java rename to indexer/src/main/java/au/org/aodn/esindexer/exception/IndexNotFoundException.java diff --git a/src/main/java/au/org/aodn/esindexer/exception/IndexingRecordException.java b/indexer/src/main/java/au/org/aodn/esindexer/exception/IndexingRecordException.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/exception/IndexingRecordException.java rename to indexer/src/main/java/au/org/aodn/esindexer/exception/IndexingRecordException.java diff --git a/src/main/java/au/org/aodn/esindexer/exception/MappingValueException.java b/indexer/src/main/java/au/org/aodn/esindexer/exception/MappingValueException.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/exception/MappingValueException.java rename to indexer/src/main/java/au/org/aodn/esindexer/exception/MappingValueException.java diff --git a/src/main/java/au/org/aodn/esindexer/exception/MetadataNotFoundException.java b/indexer/src/main/java/au/org/aodn/esindexer/exception/MetadataNotFoundException.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/exception/MetadataNotFoundException.java rename to indexer/src/main/java/au/org/aodn/esindexer/exception/MetadataNotFoundException.java diff --git a/src/main/java/au/org/aodn/esindexer/exception/MetadataUnpublishedException.java b/indexer/src/main/java/au/org/aodn/esindexer/exception/MetadataUnpublishedException.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/exception/MetadataUnpublishedException.java rename to indexer/src/main/java/au/org/aodn/esindexer/exception/MetadataUnpublishedException.java diff --git a/src/main/java/au/org/aodn/esindexer/security/APIKeyAuthFilter.java b/indexer/src/main/java/au/org/aodn/esindexer/security/APIKeyAuthFilter.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/security/APIKeyAuthFilter.java rename to indexer/src/main/java/au/org/aodn/esindexer/security/APIKeyAuthFilter.java diff --git a/src/main/java/au/org/aodn/esindexer/security/JwtAuthenticationEntryPoint.java b/indexer/src/main/java/au/org/aodn/esindexer/security/JwtAuthenticationEntryPoint.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/security/JwtAuthenticationEntryPoint.java rename to indexer/src/main/java/au/org/aodn/esindexer/security/JwtAuthenticationEntryPoint.java diff --git a/src/main/java/au/org/aodn/esindexer/service/GeoNetworkService.java b/indexer/src/main/java/au/org/aodn/esindexer/service/GeoNetworkService.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/service/GeoNetworkService.java rename to indexer/src/main/java/au/org/aodn/esindexer/service/GeoNetworkService.java diff --git a/src/main/java/au/org/aodn/esindexer/service/GeoNetworkServiceImpl.java b/indexer/src/main/java/au/org/aodn/esindexer/service/GeoNetworkServiceImpl.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/service/GeoNetworkServiceImpl.java rename to indexer/src/main/java/au/org/aodn/esindexer/service/GeoNetworkServiceImpl.java index 28c53664..108ff886 100644 --- a/src/main/java/au/org/aodn/esindexer/service/GeoNetworkServiceImpl.java +++ b/indexer/src/main/java/au/org/aodn/esindexer/service/GeoNetworkServiceImpl.java @@ -1,8 +1,8 @@ package au.org.aodn.esindexer.service; -import au.org.aodn.esindexer.configuration.AppConstants; import au.org.aodn.esindexer.exception.MetadataNotFoundException; import au.org.aodn.esindexer.utils.StringUtil; +import au.org.aodn.esindexer.configuration.AppConstants; import co.elastic.clients.elasticsearch.ElasticsearchClient; import co.elastic.clients.elasticsearch._types.query_dsl.MatchAllQuery; diff --git a/src/main/java/au/org/aodn/esindexer/service/IndexerService.java b/indexer/src/main/java/au/org/aodn/esindexer/service/IndexerService.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/service/IndexerService.java rename to indexer/src/main/java/au/org/aodn/esindexer/service/IndexerService.java diff --git a/src/main/java/au/org/aodn/esindexer/service/IndexerServiceImpl.java b/indexer/src/main/java/au/org/aodn/esindexer/service/IndexerServiceImpl.java similarity index 99% rename from src/main/java/au/org/aodn/esindexer/service/IndexerServiceImpl.java rename to indexer/src/main/java/au/org/aodn/esindexer/service/IndexerServiceImpl.java index 0f302055..9272c6f7 100644 --- a/src/main/java/au/org/aodn/esindexer/service/IndexerServiceImpl.java +++ b/indexer/src/main/java/au/org/aodn/esindexer/service/IndexerServiceImpl.java @@ -1,9 +1,10 @@ package au.org.aodn.esindexer.service; +import au.org.aodn.stac.model.StacCollectionModel; +import au.org.aodn.esindexer.utils.StringUtil; import au.org.aodn.esindexer.configuration.AppConstants; import au.org.aodn.esindexer.exception.*; import au.org.aodn.esindexer.utils.JaxbUtils; -import au.org.aodn.esindexer.utils.StringUtil; import au.org.aodn.metadata.iso19115_3_2018.*; import co.elastic.clients.elasticsearch.ElasticsearchClient; import co.elastic.clients.elasticsearch._types.ElasticsearchException; @@ -29,13 +30,12 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; -import au.org.aodn.esindexer.model.StacCollectionModel; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.util.*; -import java.util.stream.Collectors; @Service public class IndexerServiceImpl implements IndexerService { diff --git a/src/main/java/au/org/aodn/esindexer/service/RankingService.java b/indexer/src/main/java/au/org/aodn/esindexer/service/RankingService.java similarity index 73% rename from src/main/java/au/org/aodn/esindexer/service/RankingService.java rename to indexer/src/main/java/au/org/aodn/esindexer/service/RankingService.java index 2ee0a708..e212bea8 100644 --- a/src/main/java/au/org/aodn/esindexer/service/RankingService.java +++ b/indexer/src/main/java/au/org/aodn/esindexer/service/RankingService.java @@ -1,6 +1,6 @@ package au.org.aodn.esindexer.service; -import au.org.aodn.esindexer.model.StacCollectionModel; +import au.org.aodn.stac.model.StacCollectionModel; public interface RankingService { public Integer evaluateCompleteness(StacCollectionModel stacCollectionModel); diff --git a/src/main/java/au/org/aodn/esindexer/service/RankingServiceImpl.java b/indexer/src/main/java/au/org/aodn/esindexer/service/RankingServiceImpl.java similarity index 98% rename from src/main/java/au/org/aodn/esindexer/service/RankingServiceImpl.java rename to indexer/src/main/java/au/org/aodn/esindexer/service/RankingServiceImpl.java index c8bbc8cb..105c34b0 100644 --- a/src/main/java/au/org/aodn/esindexer/service/RankingServiceImpl.java +++ b/indexer/src/main/java/au/org/aodn/esindexer/service/RankingServiceImpl.java @@ -4,7 +4,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import au.org.aodn.esindexer.model.StacCollectionModel; +import au.org.aodn.stac.model.StacCollectionModel; @Service public class RankingServiceImpl implements RankingService { diff --git a/src/main/java/au/org/aodn/esindexer/service/StacCollectionMapperService.java b/indexer/src/main/java/au/org/aodn/esindexer/service/StacCollectionMapperService.java similarity index 99% rename from src/main/java/au/org/aodn/esindexer/service/StacCollectionMapperService.java rename to indexer/src/main/java/au/org/aodn/esindexer/service/StacCollectionMapperService.java index 7bcf1109..61a8ea59 100644 --- a/src/main/java/au/org/aodn/esindexer/service/StacCollectionMapperService.java +++ b/indexer/src/main/java/au/org/aodn/esindexer/service/StacCollectionMapperService.java @@ -1,10 +1,10 @@ package au.org.aodn.esindexer.service; -import au.org.aodn.esindexer.configuration.AppConstants; import au.org.aodn.esindexer.exception.MappingValueException; -import au.org.aodn.esindexer.model.*; -import au.org.aodn.esindexer.utils.BBoxUtils; import au.org.aodn.esindexer.utils.GeometryUtils; +import au.org.aodn.esindexer.configuration.AppConstants; +import au.org.aodn.stac.model.*; +import au.org.aodn.esindexer.utils.BBoxUtils; import au.org.aodn.esindexer.utils.TemporalUtils; import au.org.aodn.metadata.iso19115_3_2018.*; @@ -291,7 +291,7 @@ String mapUpdateFrequency(MDMetadataType source) { */ @Named("mapSummaries.datasetProvider") String mapDatasetOwner(MDMetadataType source) { - List providers = mapProviders(source); + List providers = mapProviders(source); return providers.stream().anyMatch(p -> p.getName().contains("IMOS")) ? "IMOS" : null; } diff --git a/src/main/java/au/org/aodn/esindexer/utils/BBoxUtils.java b/indexer/src/main/java/au/org/aodn/esindexer/utils/BBoxUtils.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/utils/BBoxUtils.java rename to indexer/src/main/java/au/org/aodn/esindexer/utils/BBoxUtils.java diff --git a/src/main/java/au/org/aodn/esindexer/utils/GeometryBase.java b/indexer/src/main/java/au/org/aodn/esindexer/utils/GeometryBase.java similarity index 96% rename from src/main/java/au/org/aodn/esindexer/utils/GeometryBase.java rename to indexer/src/main/java/au/org/aodn/esindexer/utils/GeometryBase.java index 52216032..067a3482 100644 --- a/src/main/java/au/org/aodn/esindexer/utils/GeometryBase.java +++ b/indexer/src/main/java/au/org/aodn/esindexer/utils/GeometryBase.java @@ -1,13 +1,8 @@ package au.org.aodn.esindexer.utils; import au.org.aodn.metadata.iso19115_3_2018.*; -import org.geotools.geometry.jts.JTS; -import org.geotools.geometry.jts.JTSFactoryFinder; -import org.geotools.referencing.CRS; import org.locationtech.jts.geom.*; import org.opengis.referencing.FactoryException; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.referencing.operation.MathTransform; import org.opengis.referencing.operation.TransformException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/au/org/aodn/esindexer/utils/GeometryUtils.java b/indexer/src/main/java/au/org/aodn/esindexer/utils/GeometryUtils.java similarity index 98% rename from src/main/java/au/org/aodn/esindexer/utils/GeometryUtils.java rename to indexer/src/main/java/au/org/aodn/esindexer/utils/GeometryUtils.java index e7b729a2..ecf95c53 100644 --- a/src/main/java/au/org/aodn/esindexer/utils/GeometryUtils.java +++ b/indexer/src/main/java/au/org/aodn/esindexer/utils/GeometryUtils.java @@ -1,6 +1,5 @@ package au.org.aodn.esindexer.utils; -import au.org.aodn.esindexer.model.SummariesModel; import com.fasterxml.jackson.databind.ObjectMapper; import org.geotools.geojson.geom.GeometryJSON; import org.locationtech.jts.geom.GeometryFactory; diff --git a/src/main/java/au/org/aodn/esindexer/utils/JaxbUtils.java b/indexer/src/main/java/au/org/aodn/esindexer/utils/JaxbUtils.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/utils/JaxbUtils.java rename to indexer/src/main/java/au/org/aodn/esindexer/utils/JaxbUtils.java diff --git a/src/main/java/au/org/aodn/esindexer/utils/StacUtils.java b/indexer/src/main/java/au/org/aodn/esindexer/utils/StacUtils.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/utils/StacUtils.java rename to indexer/src/main/java/au/org/aodn/esindexer/utils/StacUtils.java diff --git a/src/main/java/au/org/aodn/esindexer/utils/StringUtil.java b/indexer/src/main/java/au/org/aodn/esindexer/utils/StringUtil.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/utils/StringUtil.java rename to indexer/src/main/java/au/org/aodn/esindexer/utils/StringUtil.java diff --git a/src/main/java/au/org/aodn/esindexer/utils/TemporalUtils.java b/indexer/src/main/java/au/org/aodn/esindexer/utils/TemporalUtils.java similarity index 100% rename from src/main/java/au/org/aodn/esindexer/utils/TemporalUtils.java rename to indexer/src/main/java/au/org/aodn/esindexer/utils/TemporalUtils.java diff --git a/src/main/resources/application-dev.yaml b/indexer/src/main/resources/application-dev.yaml similarity index 100% rename from src/main/resources/application-dev.yaml rename to indexer/src/main/resources/application-dev.yaml diff --git a/src/main/resources/application.yaml b/indexer/src/main/resources/application.yaml similarity index 100% rename from src/main/resources/application.yaml rename to indexer/src/main/resources/application.yaml diff --git a/src/main/resources/config_files/portal_records_index_schema.json b/indexer/src/main/resources/config_files/portal_records_index_schema.json similarity index 100% rename from src/main/resources/config_files/portal_records_index_schema.json rename to indexer/src/main/resources/config_files/portal_records_index_schema.json diff --git a/src/test/java/au/org/aodn/esindexer/BaseTestClass.java b/indexer/src/test/java/au/org/aodn/esindexer/BaseTestClass.java similarity index 100% rename from src/test/java/au/org/aodn/esindexer/BaseTestClass.java rename to indexer/src/test/java/au/org/aodn/esindexer/BaseTestClass.java diff --git a/src/test/java/au/org/aodn/esindexer/configuration/ElasticSearchTestConfig.java b/indexer/src/test/java/au/org/aodn/esindexer/configuration/ElasticSearchTestConfig.java similarity index 100% rename from src/test/java/au/org/aodn/esindexer/configuration/ElasticSearchTestConfig.java rename to indexer/src/test/java/au/org/aodn/esindexer/configuration/ElasticSearchTestConfig.java diff --git a/src/test/java/au/org/aodn/esindexer/configuration/GeoNetworkSearchTestConfig.java b/indexer/src/test/java/au/org/aodn/esindexer/configuration/GeoNetworkSearchTestConfig.java similarity index 100% rename from src/test/java/au/org/aodn/esindexer/configuration/GeoNetworkSearchTestConfig.java rename to indexer/src/test/java/au/org/aodn/esindexer/configuration/GeoNetworkSearchTestConfig.java diff --git a/src/test/java/au/org/aodn/esindexer/service/GeoNetworkServiceTests.java b/indexer/src/test/java/au/org/aodn/esindexer/service/GeoNetworkServiceTests.java similarity index 100% rename from src/test/java/au/org/aodn/esindexer/service/GeoNetworkServiceTests.java rename to indexer/src/test/java/au/org/aodn/esindexer/service/GeoNetworkServiceTests.java diff --git a/src/test/java/au/org/aodn/esindexer/service/IndexerServiceTests.java b/indexer/src/test/java/au/org/aodn/esindexer/service/IndexerServiceTests.java similarity index 98% rename from src/test/java/au/org/aodn/esindexer/service/IndexerServiceTests.java rename to indexer/src/test/java/au/org/aodn/esindexer/service/IndexerServiceTests.java index 6ef4c44c..f4ea5dfc 100644 --- a/src/test/java/au/org/aodn/esindexer/service/IndexerServiceTests.java +++ b/indexer/src/test/java/au/org/aodn/esindexer/service/IndexerServiceTests.java @@ -2,7 +2,6 @@ import au.org.aodn.esindexer.BaseTestClass; import au.org.aodn.esindexer.configuration.GeoNetworkSearchTestConfig; -import au.org.aodn.esindexer.model.StacCollectionModel; import co.elastic.clients.elasticsearch.core.search.Hit; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/src/test/java/au/org/aodn/esindexer/service/RankingServiceTests.java b/indexer/src/test/java/au/org/aodn/esindexer/service/RankingServiceTests.java similarity index 93% rename from src/test/java/au/org/aodn/esindexer/service/RankingServiceTests.java rename to indexer/src/test/java/au/org/aodn/esindexer/service/RankingServiceTests.java index ee071a3a..9c72b4b0 100644 --- a/src/test/java/au/org/aodn/esindexer/service/RankingServiceTests.java +++ b/indexer/src/test/java/au/org/aodn/esindexer/service/RankingServiceTests.java @@ -1,19 +1,16 @@ package au.org.aodn.esindexer.service; import au.org.aodn.esindexer.BaseTestClass; -import au.org.aodn.esindexer.model.ContactsModel; -import au.org.aodn.esindexer.model.ExtentModel; -import au.org.aodn.esindexer.model.LinkModel; -import au.org.aodn.esindexer.model.StacCollectionModel; -import au.org.aodn.esindexer.model.ThemesModel; +import au.org.aodn.stac.model.ContactsModel; +import au.org.aodn.stac.model.ExtentModel; +import au.org.aodn.stac.model.LinkModel; +import au.org.aodn.stac.model.StacCollectionModel; +import au.org.aodn.stac.model.ThemesModel; import org.junit.jupiter.api.*; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; -import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Spy; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.SpringRunner; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/src/test/java/au/org/aodn/esindexer/utils/StringUtilTest.java b/indexer/src/test/java/au/org/aodn/esindexer/utils/StringUtilTest.java similarity index 97% rename from src/test/java/au/org/aodn/esindexer/utils/StringUtilTest.java rename to indexer/src/test/java/au/org/aodn/esindexer/utils/StringUtilTest.java index 958a9c8a..4d63d8e2 100644 --- a/src/test/java/au/org/aodn/esindexer/utils/StringUtilTest.java +++ b/indexer/src/test/java/au/org/aodn/esindexer/utils/StringUtilTest.java @@ -1,5 +1,6 @@ package au.org.aodn.esindexer.utils; +import au.org.aodn.esindexer.utils.StringUtil; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import java.nio.charset.StandardCharsets; diff --git a/src/test/resources/application-test.yaml b/indexer/src/test/resources/application-test.yaml similarity index 100% rename from src/test/resources/application-test.yaml rename to indexer/src/test/resources/application-test.yaml diff --git a/src/test/resources/canned/sample1.xml b/indexer/src/test/resources/canned/sample1.xml similarity index 100% rename from src/test/resources/canned/sample1.xml rename to indexer/src/test/resources/canned/sample1.xml diff --git a/src/test/resources/canned/sample2.xml b/indexer/src/test/resources/canned/sample2.xml similarity index 100% rename from src/test/resources/canned/sample2.xml rename to indexer/src/test/resources/canned/sample2.xml diff --git a/src/test/resources/canned/sample3.xml b/indexer/src/test/resources/canned/sample3.xml similarity index 100% rename from src/test/resources/canned/sample3.xml rename to indexer/src/test/resources/canned/sample3.xml diff --git a/src/test/resources/canned/sample3_stac.json b/indexer/src/test/resources/canned/sample3_stac.json similarity index 100% rename from src/test/resources/canned/sample3_stac.json rename to indexer/src/test/resources/canned/sample3_stac.json diff --git a/src/test/resources/canned/sample4.xml b/indexer/src/test/resources/canned/sample4.xml similarity index 100% rename from src/test/resources/canned/sample4.xml rename to indexer/src/test/resources/canned/sample4.xml diff --git a/src/test/resources/canned/transformed_sample2.xml b/indexer/src/test/resources/canned/transformed_sample2.xml similarity index 100% rename from src/test/resources/canned/transformed_sample2.xml rename to indexer/src/test/resources/canned/transformed_sample2.xml diff --git a/src/test/resources/compose-gn4-test.yml b/indexer/src/test/resources/compose-gn4-test.yml similarity index 100% rename from src/test/resources/compose-gn4-test.yml rename to indexer/src/test/resources/compose-gn4-test.yml diff --git a/pom.xml b/pom.xml index 85ed1e27..6409aa4f 100644 --- a/pom.xml +++ b/pom.xml @@ -11,10 +11,16 @@ au.org.aodn es-indexer 0.0.0 - jar + pom es-indexer es-indexer + + geonetwork + stacmodel + indexer + + osgeo @@ -38,258 +44,131 @@ 1.19.3 - - - - org.springframework.boot - spring-boot-starter-actuator - ${org.springboot.actuator.version} - - - org.springframework.boot - spring-boot-starter-data-rest - - - org.springframework.boot - spring-boot-configuration-processor - true - - - - commons-codec - commons-codec - 1.16.0 - - - - commons-io - commons-io - 2.15.1 - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-web-services - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-devtools - - - jakarta.activation - jakarta.activation-api - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - 2.2.0 - - - - io.jsonwebtoken - jjwt-api - 0.11.5 - - - io.jsonwebtoken - jjwt-impl - 0.11.5 - runtime - - - io.jsonwebtoken - jjwt-jackson - 0.11.5 - runtime - - - - co.elastic.clients - elasticsearch-java - 8.10.4 - - - - jakarta.xml.bind - jakarta.xml.bind-api - ${jakarta.xml.bind.version} - - - org.glassfish.jaxb - jaxb-runtime - ${jakarta.xml.bind.version} - - - org.mapstruct - mapstruct - ${org.mapstruct.version} - - - org.geotools - gt-main - ${org.geotools.version} - - - org.geotools - gt-geometry - 24.6 - - - org.geotools - gt-referencing - ${org.geotools.version} - - - - org.geotools - gt-epsg-hsql - 22.2 - - - org.geotools - gt-geojson - 29.2 - - - - javax.annotation - javax.annotation-api - 1.3.2 - - - - junit - junit - 4.13.2 - test - - - org.springframework.boot - spring-boot-starter-test - test - - - com.vaadin.external.google - android-json - - - - - org.springframework.security - spring-security-test - test - - - org.testcontainers - elasticsearch - ${org.testcontainer.version} - test - - - org.testcontainers - testcontainers - ${org.testcontainer.version} - test - - - javax.xml.bind - jaxb-api - test - 2.3.1 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 17 - 17 - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - - org.projectlombok - lombok - ${org.projectlombok.version} - - - - org.projectlombok - lombok-mapstruct-binding - 0.2.0 - - - - - - + + + + org.springframework.boot - spring-boot-maven-plugin - - - - au.org.aodn.esindexer.Application - - - - - - - org.codehaus.mojo - jaxb2-maven-plugin - 3.1.0 - - - xjc-iso19115-3.2018 - generate-sources - - xjc - - - au.org.aodn.metadata.iso19115_3_2018 - - src/main/resources/iso19115_3_2018/iso19115-3.2018.xsd - - - src/main/resources/iso19115_3_2018/iso19115-3.2018.xjb - - ${basedir}/src/main/generated - true - false - - - - - - + spring-boot-starter-actuator + ${org.springboot.actuator.version} + + + + commons-codec + commons-codec + 1.16.0 + + + + commons-io + commons-io + 2.15.1 + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.2.0 + + + + io.jsonwebtoken + jjwt-api + 0.11.5 + + + io.jsonwebtoken + jjwt-impl + 0.11.5 + runtime + + + io.jsonwebtoken + jjwt-jackson + 0.11.5 + runtime + + + + co.elastic.clients + elasticsearch-java + 8.10.4 + + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind.version} + + + org.glassfish.jaxb + jaxb-runtime + ${jakarta.xml.bind.version} + + + org.mapstruct + mapstruct + ${org.mapstruct.version} + + + org.geotools + gt-main + ${org.geotools.version} + + + org.geotools + gt-geometry + 24.6 + + + org.geotools + gt-referencing + ${org.geotools.version} + + + + org.geotools + gt-epsg-hsql + 22.2 + + + org.geotools + gt-geojson + 29.2 + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + junit + junit + 4.13.2 + test + + + org.testcontainers + elasticsearch + ${org.testcontainer.version} + test + + + org.testcontainers + testcontainers + ${org.testcontainer.version} + test + + + javax.xml.bind + jaxb-api + test + 2.3.1 + + + diff --git a/stacmodel/pom.xml b/stacmodel/pom.xml new file mode 100644 index 00000000..939cb3e9 --- /dev/null +++ b/stacmodel/pom.xml @@ -0,0 +1,31 @@ + + + + es-indexer + au.org.aodn + 0.0.0 + ../pom.xml + + 4.0.0 + + stacmodel + + + 17 + 17 + + + + + org.projectlombok + lombok + true + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + \ No newline at end of file diff --git a/stacmodel/src/main/java/au/org/aodn/stac/configuration/AppConstants.java b/stacmodel/src/main/java/au/org/aodn/stac/configuration/AppConstants.java new file mode 100644 index 00000000..f26e0a6c --- /dev/null +++ b/stacmodel/src/main/java/au/org/aodn/stac/configuration/AppConstants.java @@ -0,0 +1,9 @@ +package au.org.aodn.stac.configuration; + +import java.util.Arrays; +import java.util.List; + +public interface AppConstants { + String STAC_VERSION = "1.0.0"; + String STAC_TYPE = "Collection"; +} diff --git a/src/main/java/au/org/aodn/esindexer/model/ContactsModel.java b/stacmodel/src/main/java/au/org/aodn/stac/model/ContactsModel.java similarity index 92% rename from src/main/java/au/org/aodn/esindexer/model/ContactsModel.java rename to stacmodel/src/main/java/au/org/aodn/stac/model/ContactsModel.java index 32cf0859..33f01419 100644 --- a/src/main/java/au/org/aodn/esindexer/model/ContactsModel.java +++ b/stacmodel/src/main/java/au/org/aodn/stac/model/ContactsModel.java @@ -1,4 +1,4 @@ -package au.org.aodn.esindexer.model; +package au.org.aodn.stac.model; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/au/org/aodn/esindexer/model/ExtentModel.java b/stacmodel/src/main/java/au/org/aodn/stac/model/ExtentModel.java similarity index 98% rename from src/main/java/au/org/aodn/esindexer/model/ExtentModel.java rename to stacmodel/src/main/java/au/org/aodn/stac/model/ExtentModel.java index f4af1f1a..2f6e2651 100644 --- a/src/main/java/au/org/aodn/esindexer/model/ExtentModel.java +++ b/stacmodel/src/main/java/au/org/aodn/stac/model/ExtentModel.java @@ -1,4 +1,4 @@ -package au.org.aodn.esindexer.model; +package au.org.aodn.stac.model; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/au/org/aodn/esindexer/model/LanguageModel.java b/stacmodel/src/main/java/au/org/aodn/stac/model/LanguageModel.java similarity index 79% rename from src/main/java/au/org/aodn/esindexer/model/LanguageModel.java rename to stacmodel/src/main/java/au/org/aodn/stac/model/LanguageModel.java index fe623bec..f97de0a5 100644 --- a/src/main/java/au/org/aodn/esindexer/model/LanguageModel.java +++ b/stacmodel/src/main/java/au/org/aodn/stac/model/LanguageModel.java @@ -1,4 +1,4 @@ -package au.org.aodn.esindexer.model; +package au.org.aodn.stac.model; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/au/org/aodn/esindexer/model/LinkModel.java b/stacmodel/src/main/java/au/org/aodn/stac/model/LinkModel.java similarity index 84% rename from src/main/java/au/org/aodn/esindexer/model/LinkModel.java rename to stacmodel/src/main/java/au/org/aodn/stac/model/LinkModel.java index f43147b6..287ca4c2 100644 --- a/src/main/java/au/org/aodn/esindexer/model/LinkModel.java +++ b/stacmodel/src/main/java/au/org/aodn/stac/model/LinkModel.java @@ -1,4 +1,4 @@ -package au.org.aodn.esindexer.model; +package au.org.aodn.stac.model; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/au/org/aodn/esindexer/model/ProviderModel.java b/stacmodel/src/main/java/au/org/aodn/stac/model/ProviderModel.java similarity index 86% rename from src/main/java/au/org/aodn/esindexer/model/ProviderModel.java rename to stacmodel/src/main/java/au/org/aodn/stac/model/ProviderModel.java index da0d94e1..b0c334fa 100644 --- a/src/main/java/au/org/aodn/esindexer/model/ProviderModel.java +++ b/stacmodel/src/main/java/au/org/aodn/stac/model/ProviderModel.java @@ -1,4 +1,4 @@ -package au.org.aodn.esindexer.model; +package au.org.aodn.stac.model; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/au/org/aodn/esindexer/model/StacCollectionModel.java b/stacmodel/src/main/java/au/org/aodn/stac/model/StacCollectionModel.java similarity index 94% rename from src/main/java/au/org/aodn/esindexer/model/StacCollectionModel.java rename to stacmodel/src/main/java/au/org/aodn/stac/model/StacCollectionModel.java index b26ad8dc..de78d463 100644 --- a/src/main/java/au/org/aodn/esindexer/model/StacCollectionModel.java +++ b/stacmodel/src/main/java/au/org/aodn/stac/model/StacCollectionModel.java @@ -1,6 +1,6 @@ -package au.org.aodn.esindexer.model; +package au.org.aodn.stac.model; -import au.org.aodn.esindexer.configuration.AppConstants; +import au.org.aodn.stac.configuration.AppConstants; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/au/org/aodn/esindexer/model/SummariesModel.java b/stacmodel/src/main/java/au/org/aodn/stac/model/SummariesModel.java similarity index 96% rename from src/main/java/au/org/aodn/esindexer/model/SummariesModel.java rename to stacmodel/src/main/java/au/org/aodn/stac/model/SummariesModel.java index 6d5cee4f..a583528f 100644 --- a/src/main/java/au/org/aodn/esindexer/model/SummariesModel.java +++ b/stacmodel/src/main/java/au/org/aodn/stac/model/SummariesModel.java @@ -1,4 +1,4 @@ -package au.org.aodn.esindexer.model; +package au.org.aodn.stac.model; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Builder; diff --git a/src/main/java/au/org/aodn/esindexer/model/ThemesModel.java b/stacmodel/src/main/java/au/org/aodn/stac/model/ThemesModel.java similarity index 88% rename from src/main/java/au/org/aodn/esindexer/model/ThemesModel.java rename to stacmodel/src/main/java/au/org/aodn/stac/model/ThemesModel.java index 7436a12c..291f2118 100644 --- a/src/main/java/au/org/aodn/esindexer/model/ThemesModel.java +++ b/stacmodel/src/main/java/au/org/aodn/stac/model/ThemesModel.java @@ -1,4 +1,4 @@ -package au.org.aodn.esindexer.model; +package au.org.aodn.stac.model; import lombok.Builder; import lombok.Data; From 35d10359ea18b69ee052c7e9292fff540f05cd15 Mon Sep 17 00:00:00 2001 From: utas-raymondng Date: Fri, 15 Mar 2024 09:49:33 +1100 Subject: [PATCH 2/5] Add JAVA_OPTS --- Dockerfile | 6 +++--- geonetwork/pom.xml | 15 +++++++++++++++ pom.xml | 1 + stacmodel/pom.xml | 20 ++++++++++++++++++++ 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7bcbe56d..46e418ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ FROM amazoncorretto:17 # Need to take node on the X-APi-KEY environment varibale WORKDIR /app +COPY ./indexer/target/indexer-*.jar /app/app.jar -COPY ./target/es-indexer-*.jar /app/app.jar - +ENV PROFILE='default' EXPOSE 8080 -CMD ["java", "-jar", "app.jar"] +ENTRYPOINT exec java ${JAVA_OPTS} -jar app.jar \ No newline at end of file diff --git a/geonetwork/pom.xml b/geonetwork/pom.xml index 304a2b9d..c23ca9e1 100644 --- a/geonetwork/pom.xml +++ b/geonetwork/pom.xml @@ -11,6 +11,7 @@ 4.0.0 geonetwork + jar 17 @@ -57,6 +58,20 @@ + + org.apache.maven.plugins + maven-source-plugin + ${maven.sourceplugin.version} + + + attach-sources + verify + + jar-no-fork + + + + diff --git a/pom.xml b/pom.xml index 6409aa4f..f556a01c 100644 --- a/pom.xml +++ b/pom.xml @@ -35,6 +35,7 @@ 17 17 + 3.3.0 UTF-8 1.5.5.Final 4.0.1 diff --git a/stacmodel/pom.xml b/stacmodel/pom.xml index 939cb3e9..2be07de4 100644 --- a/stacmodel/pom.xml +++ b/stacmodel/pom.xml @@ -11,6 +11,7 @@ 4.0.0 stacmodel + jar 17 @@ -28,4 +29,23 @@ jackson-datatype-jsr310 + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven.sourceplugin.version} + + + attach-sources + verify + + jar-no-fork + + + + + + \ No newline at end of file From e33a67620bafec2e3a18d30b5f7acd8725c9cf96 Mon Sep 17 00:00:00 2001 From: utas-raymondng Date: Fri, 15 Mar 2024 10:19:31 +1100 Subject: [PATCH 3/5] Update README.md --- README.md | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6e14ac77..da68900e 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,10 @@ This application is built with `Spring Boot 3` and `Java 17`. There are required environment variables to run the `es-indexer`: ```env -# Client calling the Indexer API must provide this token in the Authorization header +# Client calling the Indexer API must provide this token in the Authorization header, these value is set +# in [appdeply](https://github.com/aodn/appdeploy/blob/main/tg/edge/es-indexer/ecs/variables.yaml) for edge env +# under environment_variables: + APP_HTTP_AUTH_TOKEN=sampletoken SERVER_PORT=8080 @@ -28,18 +31,32 @@ GEONETWORK_HOST=http://localhost:8080 ### Maven build ```console +mvn clean install +or mvn clean install [-DskipTests] + +# If you do not use skipTest, then autotest will run where it will create a docker geonetwork instance, inject the +sample data and then run the indexer. You can treat this as kind of integration testing. ``` +This project container 3 submodules: +* geonetwork - This is used to compile JAXB lib to handle XML return from GEONetowrk, it is iso19115 standard +* stacmodel - A group of java class that create the STAC json which store in elastic search, so if app needs to read STAC from elastic, use this lib +* indexer - The main app that do the transformation. + ### Docker ```console +# Start a local instance of indexer + docker-compose -f docker-compose-dev.yaml up [-d: in daemon mode | --build: to see the console logs] ``` ### Endpoints: -- Health check: `/actuator/health` -- POST/GET/DELETE against specific record: `/api/v1/indexer/index/{records-uuid}` -- Bulk index: `/api/v1/indexer/index/all` -- Swagger UI: `/swagger-ui/index.html` +| Description | Endpoints | +| ---- |---------------------| +| Health check | `/actuator/health` | +| POST/GET/DELETE against specific record | `/api/v1/indexer/index/{records-uuid}` | +| Bulk index | `/api/v1/indexer/index/all` | +| Swagger UI: | `/swagger-ui/index.html` | From 40ecc8b5e2de769336737c2bc185e1c3ddd4fdd3 Mon Sep 17 00:00:00 2001 From: utas-raymondng Date: Fri, 15 Mar 2024 10:27:44 +1100 Subject: [PATCH 4/5] Update README.md --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index da68900e..df6bda2a 100644 --- a/README.md +++ b/README.md @@ -54,9 +54,10 @@ docker-compose -f docker-compose-dev.yaml up [-d: in daemon mode | --build: to s ### Endpoints: -| Description | Endpoints | -| ---- |---------------------| -| Health check | `/actuator/health` | +| Description | Endpoints | +|-----------------------------------------|----------------------------------------| +| Health check | `/actuator/health` | | POST/GET/DELETE against specific record | `/api/v1/indexer/index/{records-uuid}` | -| Bulk index | `/api/v1/indexer/index/all` | -| Swagger UI: | `/swagger-ui/index.html` | +| Bulk index | `/api/v1/indexer/index/all` | +| Swagger UI: | `/swagger-ui/index.html` | + From 61f4e2ca9b3d21d8bb00011543faf57077c17327 Mon Sep 17 00:00:00 2001 From: utas-raymondng Date: Fri, 15 Mar 2024 10:48:38 +1100 Subject: [PATCH 5/5] Update README.md --- Dockerfile | 2 +- README.md | 20 ++++++++++---------- geonetwork/pom.xml | 2 +- indexer/pom.xml | 2 +- stacmodel/pom.xml | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 46e418ce..3e2e7e66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,4 +6,4 @@ COPY ./indexer/target/indexer-*.jar /app/app.jar ENV PROFILE='default' EXPOSE 8080 -ENTRYPOINT exec java ${JAVA_OPTS} -jar app.jar \ No newline at end of file +ENTRYPOINT exec java ${JAVA_OPTS} -jar app.jar diff --git a/README.md b/README.md index df6bda2a..28381745 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,8 @@ GEONETWORK_HOST=http://localhost:8080 ### Maven build ```console -mvn clean install -or +mvn clean install +or mvn clean install [-DskipTests] # If you do not use skipTest, then autotest will run where it will create a docker geonetwork instance, inject the @@ -41,7 +41,8 @@ sample data and then run the indexer. You can treat this as kind of integration This project container 3 submodules: * geonetwork - This is used to compile JAXB lib to handle XML return from GEONetowrk, it is iso19115 standard -* stacmodel - A group of java class that create the STAC json which store in elastic search, so if app needs to read STAC from elastic, use this lib +* stacmodel - A group of java class that create the STAC json which store in elastic search, so if app needs to read +STAC from elastic, use this lib * indexer - The main app that do the transformation. ### Docker @@ -54,10 +55,9 @@ docker-compose -f docker-compose-dev.yaml up [-d: in daemon mode | --build: to s ### Endpoints: -| Description | Endpoints | -|-----------------------------------------|----------------------------------------| -| Health check | `/actuator/health` | -| POST/GET/DELETE against specific record | `/api/v1/indexer/index/{records-uuid}` | -| Bulk index | `/api/v1/indexer/index/all` | -| Swagger UI: | `/swagger-ui/index.html` | - +| Description | Endpoints | +|-------------|-------| +| Health check | `/actuator/health` | +| POST/GET/DELETE against specific record | `/api/v1/indexer/index/{records-uuid}`| +| Bulk index | `/api/v1/indexer/index/all`| +| Swagger UI: | `/swagger-ui/index.html`| diff --git a/geonetwork/pom.xml b/geonetwork/pom.xml index c23ca9e1..52f6c52a 100644 --- a/geonetwork/pom.xml +++ b/geonetwork/pom.xml @@ -75,4 +75,4 @@ - \ No newline at end of file + diff --git a/indexer/pom.xml b/indexer/pom.xml index 1b8a6569..defeeac9 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -232,4 +232,4 @@ - \ No newline at end of file + diff --git a/stacmodel/pom.xml b/stacmodel/pom.xml index 2be07de4..078f8682 100644 --- a/stacmodel/pom.xml +++ b/stacmodel/pom.xml @@ -48,4 +48,4 @@ - \ No newline at end of file +