From 14835a63e0ff776f942446d06e740ca480b9b126 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Fri, 19 Apr 2013 16:16:04 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/d4science/gcube/trunk/spatial-data/geonetwork@73709 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 2 +- .../data/geonetwork/test/AMMetaCreation.java | 104 +++++++++++------- .../data/geonetwork/test/QueryLogger.java | 11 +- .../geonetwork/test/TestConfiguration.java | 23 ++++ .../geonetwork/test/UpdatePrivileges.java | 23 ++++ 5 files changed, 114 insertions(+), 49 deletions(-) create mode 100644 src/test/java/org/gcube/spatial/data/geonetwork/test/TestConfiguration.java create mode 100644 src/test/java/org/gcube/spatial/data/geonetwork/test/UpdatePrivileges.java diff --git a/pom.xml b/pom.xml index 4976c15..0e281c6 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.gcube.spatial.data geonetwork - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT geonetwork diff --git a/src/test/java/org/gcube/spatial/data/geonetwork/test/AMMetaCreation.java b/src/test/java/org/gcube/spatial/data/geonetwork/test/AMMetaCreation.java index 8a756a7..cce0f81 100644 --- a/src/test/java/org/gcube/spatial/data/geonetwork/test/AMMetaCreation.java +++ b/src/test/java/org/gcube/spatial/data/geonetwork/test/AMMetaCreation.java @@ -34,6 +34,7 @@ import org.geotoolkit.metadata.iso.distribution.DefaultDigitalTransferOptions; import org.geotoolkit.metadata.iso.distribution.DefaultDistribution; import org.geotoolkit.metadata.iso.distribution.DefaultFormat; import org.geotoolkit.metadata.iso.extent.DefaultExtent; +import org.geotoolkit.metadata.iso.identification.DefaultBrowseGraphic; import org.geotoolkit.metadata.iso.identification.DefaultDataIdentification; import org.geotoolkit.metadata.iso.identification.DefaultKeywords; import org.geotoolkit.metadata.iso.lineage.DefaultAlgorithm; @@ -67,20 +68,7 @@ import org.opengis.metadata.spatial.TopologyLevel; public class AMMetaCreation { - static class TestConfiguration implements Configuration{ - @Override - public String getGeoNetworkEndpoint() { - return "http://geoserver-dev2.d4science-ii.research-infrastructures.eu/geonetwork"; - } - @Override - public String getGeoNetworkPassword() { - return "admin"; - } - @Override - public String getGeoNetworkUser() { - return "admin"; - } - } + /** * @param args @@ -92,6 +80,9 @@ public class AMMetaCreation { // ref http://www.fao.org/geonetwork/srv/en/csw?service=CSW&request=GetRecordById&Version=2.0.2&elementSetName=full&outputSchema=http://www.isotc211.org/2005/gmd&id=74f6864c-3e3e-4cd8-a2ea-188337dc6334 + private static final String devVRE_Group="5"; + private static final String devsec_Group="6"; + public static void main(String[] args) throws Exception { Metadata meta=generateMeta(); @@ -109,7 +100,7 @@ public class AMMetaCreation { ConfigurationManager.setConfiguration(new TestConfiguration()); GeoNetworkPublisher publisher=GeoNetwork.get(); - GNInsertConfiguration config=new GNInsertConfiguration("3", "datasets", "_none_", true); + GNInsertConfiguration config=new GNInsertConfiguration(devVRE_Group, "datasets", "_none_", true); long id=publisher.insertMetadata(config, meta); System.out.println("Published ID : "+id); @@ -151,11 +142,11 @@ public class AMMetaCreation { String project="iMarine"; String projectLink="http://www.i-marine.eu"; - + String projectContact="https://support.d4science.research-infrastructures.eu/"; // MAP CONSTANTS - String abstractField="Map, generated by gCube AquaMaps Suite."; + String abstractField=" Map, generated by gCube AquaMaps Suite."; String purpose="To serve and protect"; // ALGORITHM CITATION @@ -182,6 +173,21 @@ public class AMMetaCreation { layerUris.add("http://geoserver2.d4science.research-infrastructures.eu/geoserver/aquamaps/wms/kml?layers=aquamaps:lphotoblepharonpalpebratum20121207161220677cet"); layerUris.add("http://geoserver2.d4science.research-infrastructures.eu/geoserver/aquamaps/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=aquamaps:lphotoblepharonpalpebratum20121207161220677cet&maxFeatures=50&outputFormat=GML2"); + List staticImgs=new ArrayList(); + staticImgs.add("http://aquamaps.research-infrastructures.eu/80/Animalia/Chordata/Actinopterygii/Tetraodontiformes/Balistidae/Fis-53544/Earth.jpg"); + staticImgs.add("http://aquamaps.research-infrastructures.eu/80/Animalia/Chordata/Actinopterygii/Tetraodontiformes/Balistidae/Fis-53544/Continent_View__Africa.jpg"); + staticImgs.add("http://aquamaps.research-infrastructures.eu/80/Animalia/Chordata/Actinopterygii/Tetraodontiformes/Balistidae/Fis-53544/Continent_View__Asia.jpg"); + staticImgs.add("http://aquamaps.research-infrastructures.eu/80/Animalia/Chordata/Actinopterygii/Tetraodontiformes/Balistidae/Fis-53544/Continent_View__Australia.jpg"); + staticImgs.add("http://aquamaps.research-infrastructures.eu/80/Animalia/Chordata/Actinopterygii/Tetraodontiformes/Balistidae/Fis-53544/Continent_View__Europa.jpg"); + staticImgs.add("http://aquamaps.research-infrastructures.eu/80/Animalia/Chordata/Actinopterygii/Tetraodontiformes/Balistidae/Fis-53544/Continent_View__North_America.jpg"); + staticImgs.add("http://aquamaps.research-infrastructures.eu/80/Animalia/Chordata/Actinopterygii/Tetraodontiformes/Balistidae/Fis-53544/Continent_View__South_America.jpg"); + staticImgs.add("http://aquamaps.research-infrastructures.eu/80/Animalia/Chordata/Actinopterygii/Tetraodontiformes/Balistidae/Fis-53544/Ocean_View__Atlantic.jpg"); + staticImgs.add("http://aquamaps.research-infrastructures.eu/80/Animalia/Chordata/Actinopterygii/Tetraodontiformes/Balistidae/Fis-53544/Ocean_View__Indian.jpg"); + staticImgs.add("http://aquamaps.research-infrastructures.eu/80/Animalia/Chordata/Actinopterygii/Tetraodontiformes/Balistidae/Fis-53544/Pole_View__Artic.jpg"); + staticImgs.add("http://aquamaps.research-infrastructures.eu/80/Animalia/Chordata/Actinopterygii/Tetraodontiformes/Balistidae/Fis-53544/Ocean_View__North_Atlantic.jpg"); + staticImgs.add("http://aquamaps.research-infrastructures.eu/80/Animalia/Chordata/Actinopterygii/Tetraodontiformes/Balistidae/Fis-53544/Ocean_View__Pacific.jpg"); + staticImgs.add("http://aquamaps.research-infrastructures.eu/80/Animalia/Chordata/Actinopterygii/Tetraodontiformes/Balistidae/Fis-53544/Pole_View__Antarctic.jpg"); + staticImgs.add("http://aquamaps.research-infrastructures.eu/80/Animalia/Chordata/Actinopterygii/Tetraodontiformes/Balistidae/Fis-53544/Ocean_View__South_Atlantic.jpg"); HashMap> descriptiveKeyWords=new HashMap>(); HashSet keySet=new HashSet(); @@ -289,13 +295,20 @@ public class AMMetaCreation { DefaultFormat format3 = new DefaultFormat(); format3.setName(new DefaultInternationalString("WCS")); format3.setVersion(new DefaultInternationalString("1.0.0")); - - distribution.setDistributionFormats(new ArrayList(Arrays.asList(format1, format2, format3))); + + DefaultFormat format4 = new DefaultFormat(); + format4.setName(new DefaultInternationalString("JPG")); + format4.setVersion(new DefaultInternationalString("ISO/IEC 10918-1")); + + distribution.setDistributionFormats(new ArrayList(Arrays.asList(format1, format2, format3,format4))); + + for(String uri:staticImgs) + ident.getGraphicOverviews().add(new DefaultBrowseGraphic(new URI(uri))); //MetadataConstraints DefaultLegalConstraints constraints=new DefaultLegalConstraints(); - constraints.getUseLimitations().add(new DefaultInternationalString("Licensed")); + constraints.getUseLimitations().add(new DefaultInternationalString("CC-BY-SA")); constraints.getAccessConstraints().add(Restriction.LICENSE); constraints.getUseConstraints().add(Restriction.LICENSE); @@ -312,25 +325,31 @@ public class AMMetaCreation { DefaultDataQuality processQuality=new DefaultDataQuality(); DefaultLineage processLineage=new DefaultLineage(); - DefaultProcessStep processStep=new DefaultProcessStep(); - processStep.setDescription(new DefaultInternationalString("AquaMaps Environmental niche modelling")); -// DefaultSource source=new DefaultSource(); -// DefaultNominalResolution resolution=new DefaultNominalResolution(); -// resolution.setGroundResolution(0.5d); -// resolution.setScanningResolution(0.5d); -// -// DefaultCitation sourceCitation=new DefaultCitation(); -// sourceCitation.setTitle(new DefaultInternationalString(sourceTitle)); -// sourceCitation.getDates().add(new DefaultCitationDate(sourceGenerationDate, DateType.CREATION)); -// sourceCitation.getIdentifiers().add(new DefaultIdentifier(sourceTableName)); -// source.setSourceCitation(sourceCitation); -// processStep.setSources(new ArrayList(Arrays.asList(source))); -// -// DefaultProcessing processing=new DefaultProcessing(); -// -// DefaultAlgorithm algorithm=new DefaultAlgorithm(); -// algorithm.setDescription(new DefaultInternationalString(algorithmDescription)); + + DefaultSource source=new DefaultSource(); + DefaultNominalResolution resolution=new DefaultNominalResolution(); + resolution.setGroundResolution(0.5d); + resolution.setScanningResolution(0.5d); + source.getSourceExtents().add(DefaultExtent.WORLD); + + + DefaultCitation sourceCitation=new DefaultCitation(); + sourceCitation.setTitle(new DefaultInternationalString(sourceTitle)); + sourceCitation.getDates().add(new DefaultCitationDate(sourceGenerationDate, DateType.CREATION)); + sourceCitation.getIdentifiers().add(new DefaultIdentifier(sourceTableName)); + source.setSourceCitation(sourceCitation); + + + + + DefaultProcessStep processStep=new DefaultProcessStep(); + processStep.setDescription(new DefaultInternationalString("AquaMaps Ecological Niche Modelling")); + DefaultProcessing processing=new DefaultProcessing(); + DefaultAlgorithm algorithm=new DefaultAlgorithm(); + algorithm.setDescription(new DefaultInternationalString(algorithmDescription)); + processing.setRunTimeParameters(new DefaultInternationalString(custom.toXML())); + processing.getAlgorithms().add(algorithm); //Commented advanced algorithm citation @@ -351,11 +370,12 @@ public class AMMetaCreation { // processing.getAlgorithms().add(algorithm); // // -// processing.setRunTimeParameters(new DefaultInternationalString(custom.toXML())); -// processStep.setProcessingInformation(processing); - processLineage.setProcessSteps(new ArrayList(Arrays.asList(processStep))); + + + processLineage.getProcessSteps().add(processStep); + processLineage.getSources().add(source); processQuality.setLineage(processLineage); processQuality.setScope(new DefaultScope(ScopeCode.DATASET)); @@ -368,6 +388,8 @@ public class AMMetaCreation { meta.getMetadataConstraints().add(constraints); meta.getDataQualityInfo().add(processQuality); meta.setLanguage(Locale.ENGLISH); + meta.getHierarchyLevels().add(ScopeCode.DATASET); + return meta; } } diff --git a/src/test/java/org/gcube/spatial/data/geonetwork/test/QueryLogger.java b/src/test/java/org/gcube/spatial/data/geonetwork/test/QueryLogger.java index 42d8253..57fac36 100644 --- a/src/test/java/org/gcube/spatial/data/geonetwork/test/QueryLogger.java +++ b/src/test/java/org/gcube/spatial/data/geonetwork/test/QueryLogger.java @@ -17,10 +17,6 @@ import org.junit.Test; public class QueryLogger { - /** - * @param args - */ - private static final String defaultScope="/gcube/devsec"; // private static final String defaultScope="/d4science.research-infrastructures.eu/gCubeApps"; private static final boolean printEverything=true; @@ -44,9 +40,10 @@ public class QueryLogger { ScopeProvider.instance.set(defaultScope); System.out.println("Looking for ANY 'aquamaps'"); GNSearchRequest req=new GNSearchRequest(); - req.addParam(GNSearchRequest.Param.any,"aquamaps:*"); - req.addConfig(GNSearchRequest.Config.hitsPerPage, "0"); - req.addConfig(GNSearchRequest.Config.remote, "true"); + req.addParam(GNSearchRequest.Param.title,"WorldClimBio2"); + req.addConfig(GNSearchRequest.Config.similarity, "1"); +// req.addConfig(GNSearchRequest.Config.hitsPerPage, "0"); +// req.addConfig(GNSearchRequest.Config.remote, "true"); System.out.println(out.outputString(req.toElement())); // req.addConfig(GNSearchRequest.Config.sortBy, "title"); // req.addParam(GNSearchRequest.Param.themeKey, "figis"); diff --git a/src/test/java/org/gcube/spatial/data/geonetwork/test/TestConfiguration.java b/src/test/java/org/gcube/spatial/data/geonetwork/test/TestConfiguration.java new file mode 100644 index 0000000..cb34857 --- /dev/null +++ b/src/test/java/org/gcube/spatial/data/geonetwork/test/TestConfiguration.java @@ -0,0 +1,23 @@ +package org.gcube.spatial.data.geonetwork.test; + +import org.gcube.spatial.data.geonetwork.configuration.Configuration; + +/** + * @param args + */ + + +class TestConfiguration implements Configuration{ + @Override + public String getGeoNetworkEndpoint() { + return "http://geoserver-dev2.d4science-ii.research-infrastructures.eu/geonetwork"; + } + @Override + public String getGeoNetworkPassword() { + return "devVRE_Private"; + } + @Override + public String getGeoNetworkUser() { + return "devVRE_Private"; + } +} \ No newline at end of file diff --git a/src/test/java/org/gcube/spatial/data/geonetwork/test/UpdatePrivileges.java b/src/test/java/org/gcube/spatial/data/geonetwork/test/UpdatePrivileges.java new file mode 100644 index 0000000..23995fd --- /dev/null +++ b/src/test/java/org/gcube/spatial/data/geonetwork/test/UpdatePrivileges.java @@ -0,0 +1,23 @@ +package org.gcube.spatial.data.geonetwork.test; + +import it.geosolutions.geonetwork.util.GNPrivConfiguration; + +import org.gcube.spatial.data.geonetwork.GeoNetwork; +import org.gcube.spatial.data.geonetwork.GeoNetworkPublisher; +import org.gcube.spatial.data.geonetwork.configuration.ConfigurationManager; + +public class UpdatePrivileges { + + /** + * @param args + * @throws Exception + */ + public static void main(String[] args) throws Exception { + ConfigurationManager.setConfiguration(new TestConfiguration()); + GeoNetworkPublisher publisher=GeoNetwork.get(); + GNPrivConfiguration cfg=new GNPrivConfiguration(); +// cfg.addPrivileges(5, privs) + publisher.setPrivileges(95339, cfg); + } + +}