This commit is contained in:
Fabio Sinibaldi 2017-02-10 17:40:28 +00:00
parent a1268be08f
commit 0397c0e1f8
2 changed files with 27 additions and 29 deletions

View File

@ -33,22 +33,22 @@ public class ScopeTests {
// DEV // DEV
scopes.add("/gcube"); scopes.add("/gcube");
scopes.add("/gcube/devNext"); // scopes.add("/gcube/devNext");
scopes.add("/gcube/devsec"); // scopes.add("/gcube/devsec");
//
scopes.add("/gcube/devNext/NextNext"); // scopes.add("/gcube/devNext/NextNext");
//
scopes.add("/gcube/devsec/StaTabTest"); // scopes.add("/gcube/devsec/StaTabTest");
//
//
scopes.add("/gcube/devsec/RMinerDev"); // scopes.add("/gcube/devsec/RMinerDev");
//
//
//
scopes.add("/gcube/devsec/TabProcessing"); // scopes.add("/gcube/devsec/TabProcessing");
//
scopes.add("/gcube/devsec/devVRE"); // scopes.add("/gcube/devsec/devVRE");
//
// scopes.add("/gcube/preprod/preVRE"); // scopes.add("/gcube/preprod/preVRE");

View File

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