gCubeSystem
/
geonetwork
16
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Merged 

git-svn-id: http://svn.research-infrastructures.eu/d4science/gcube/trunk/spatial-data/geonetwork@181823 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Fabio Sinibaldi 2019-09-23 13:36:04 +00:00
parent dc4d1f6652
commit 2f5f0d2226
7 changed files with 46 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -4,11 +4,11 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.gcube.tools</groupId>
<version>1.0.0</version>
<version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>org.gcube.spatial.data</groupId>
<artifactId>geonetwork</artifactId>
<version>3.2.2-SNAPSHOT</version>
<version>3.2.3-SNAPSHOT</version>
<name>geonetwork</name>
<properties>

10
src/main/java/org/gcube/spatial/data/geonetwork/GeoNetwork.java
View File

@ -413,7 +413,15 @@ public class GeoNetwork implements GeoNetworkAdministration {
break;
}
return new GNInsertConfiguration(configuredGroup+"", category, styleSheet, true);
boolean validate=false;
try{
validate=Boolean.parseBoolean(new RuntimeParameters().getProps().getProperty(RuntimeParameters.defaultValidation));
}catch(Throwable t) {
log.warn("Unable to read parameter "+RuntimeParameters.defaultValidation,t);
}
return new GNInsertConfiguration(configuredGroup+"", category, styleSheet, validate);
}
//******************************* ADMIN ********************************* //

1
src/main/java/org/gcube/spatial/data/geonetwork/utils/RuntimeParameters.java
View File

@ -38,6 +38,7 @@ public class RuntimeParameters {
public static final String geonetworkUpdateWait="geonetworkUpdateWait";
public static final String mandatoryValidation="mandatoryValidation";
public static final String defaultValidation="defaultValidation";
private Properties props=new Properties();

1
src/main/resources/org/gcube/spatial/data/geonetwork/query.properties
View File

@ -38,3 +38,4 @@ geonetworkUpdateWait=500
#Publishing
mandatoryValidation=false
defaultValidation=false

41
src/test/java/org/gcube/spatial/data/geonetwork/test/ScopeTests.java
View File

@ -32,30 +32,28 @@ public class ScopeTests {
static{
// DEV
// scopes.add("/gcube");
// scopes.add("/gcube/devNext");
// scopes.add("/gcube/devsec");
//
scopes.add("/gcube");
scopes.add("/gcube/devNext");
scopes.add("/gcube/devsec");
scopes.add("/gcube/devNext/NextNext");
//
// scopes.add("/gcube/devsec/StaTabTest");
//
//
// scopes.add("/gcube/devsec/RMinerDev");
//
//
//
// scopes.add("/gcube/devsec/TabProcessing");
//
// scopes.add("/gcube/devsec/devVRE");
//
scopes.add("/gcube/devsec/StaTabTest");
scopes.add("/gcube/devsec/RMinerDev");
scopes.add("/gcube/devsec/TabProcessing");
scopes.add("/gcube/devsec/devVRE");
// scopes.add("/gcube/preprod/preVRE");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/FAO_TunaAtlas");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/EGIP");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/SIASPA");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/InfraScience");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/ICES_TCRE");
@ -72,6 +70,7 @@ public class ScopeTests {
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/ScalableDataMining");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/BiodiversityLab");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/DESCRAMBLE");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/FAO_TunaAtlas");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/StocksAndFisheriesKB");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/BlueCommons");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/ICES_TCSSM");
@ -96,15 +95,13 @@ public class ScopeTests {
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/EFG");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/StockAssessment");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/iSearch");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/ICOS_ETC");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/VesselActivitiesAnalyzer");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/BiOnym");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/SoBigData.eu");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/PerformanceEvaluationInAquaculture");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/StrategicInvestmentAnalysis");
// scopes.add("/d4science.research-infrastructures.eu/D4Research/FisheriesandEcosystemAtMII");
}

24
src/test/java/org/gcube/spatial/data/geonetwork/test/TestConfiguration.java
View File

@ -4,6 +4,8 @@ import org.gcube.spatial.data.geonetwork.GeoNetwork;
import org.gcube.spatial.data.geonetwork.GeoNetworkAdministration;
import org.gcube.spatial.data.geonetwork.configuration.Configuration;
import org.gcube.spatial.data.geonetwork.configuration.DefaultConfiguration;
import org.gcube.spatial.data.geonetwork.configuration.LocalResourceConfiguration;
import org.gcube.spatial.data.geonetwork.configuration.LocalResourceConfiguration.ResourceConfiguration;
import org.gcube.spatial.data.geonetwork.model.faults.AuthorizationException;
import org.gcube.spatial.data.geonetwork.model.faults.EncryptionException;
import org.gcube.spatial.data.geonetwork.model.faults.MissingConfigurationException;
@ -20,19 +22,19 @@ public class TestConfiguration {
@Synchronized
public static GeoNetworkAdministration getClient() throws MissingConfigurationException, EncryptionException, MissingServiceEndpointException, GNLibException, GNServerException, AuthorizationException{
if(toUseConfiguration==null){
//
// ResourceConfiguration resConfig=new ResourceConfiguration();
// resConfig.setAdminPassword("admin");
// resConfig.setVersion((short)3);
// resConfig.setMinor((short)0);
// resConfig.setRevision((short)5);
// resConfig.setBuild((short)0);
// resConfig.setHost("node3-d-d4s.d4science.org");
// resConfig.setEndpoint("http://node3-d-d4s.d4science.org/geonetwork");
// toUseConfiguration=new LocalResourceConfiguration(resConfig);
ResourceConfiguration resConfig=new ResourceConfiguration();
resConfig.setAdminPassword("admin");
resConfig.setVersion((short)3);
resConfig.setMinor((short)0);
resConfig.setRevision((short)5);
resConfig.setBuild((short)0);
resConfig.setHost("node3-d-d4s.d4science.org");
resConfig.setEndpoint("http://node3-d-d4s.d4science.org/geonetwork");
toUseConfiguration=new LocalResourceConfiguration(resConfig);
toUseConfiguration=new DefaultConfiguration();
// toUseConfiguration=new DefaultConfiguration();
}
return GeoNetwork.get(toUseConfiguration);
}

2
src/test/resources/log4j.properties
View File

@ -1,4 +1,4 @@
log4j.rootLogger=DEBUG, A1
log4j.rootLogger=DEBUG, A1,stdout
log4j.appender.A1=org.apache.log4j.RollingFileAppender
log4j.appender.A1.File=log.txt
log4j.appender.A1.layout=org.apache.log4j.PatternLayout