updated date

Added property catalogPortletURL and method findDetachedVREforVREName
2020-06-15 14:29:10 +02:00 · 2020-06-08 15:18:03 +02:00
6 changed files with 29 additions and 105 deletions
--- a/.classpath
+++ b/.classpath
@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/detachedres-library-1.1.0/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/detachedres-library-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/detachedres-library-1.1.0/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/detachedres-library-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@ -34,5 +34,5 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="output" path="target/detachedres-library-1.1.0/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/detachedres-library-1.0.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,15 +1,15 @@
 # Changelog

+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

-## [v1.1.0] [r4.24.0] - 2020-06-05
+## [v1-1-0] [r4-24-0]- 2020-06-05

-### Features
+**New features**

- Added the property cataloguePortletURL and the method [#19440]
+[#19440] Added the property cataloguePortletURL and the method 

-## [v1.0.0] - 2020-04-01
+## [1-0-0] - [2020-04-01]

 First release

-
-This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
--- a/changelog.xml
+++ b/changelog.xml
@ -1,9 +1,4 @@
 <ReleaseNotes>
-	<Changeset
-		component="org.gcube.infrastructure.detachedres.detachedres-library.1-1-0"
-		date="2020-06-18">
-		<Change>Added the property cataloguePortletURL and the method [#19440]</Change>
-	</Changeset>
 	<Changeset
 		component="org.gcube.infrastructure.detachedres.detachedres-library.1-0-0"
 		date="2020-04-01">
--- a/descriptor.xml
+++ b/descriptor.xml
@ -14,7 +14,6 @@
 			<includes>
 				<include>README.md</include>
 				<include>LICENSE.md</include>
-				<include>CHANGELOG.md</include>
 				<include>changelog.xml</include>
 				<include>profile.xml</include>
 			</includes>
--- a/pom.xml
+++ b/pom.xml
@ -11,7 +11,7 @@
 	<groupId>org.gcube.infrastructure.detachedres</groupId>
 	<artifactId>detachedres-library</artifactId>
 	<name>detachedres-library</name>
-	<version>1.1.0</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<description>Detached Resource Entities Library</description>


--- a/src/test/java/org/gcube/infrastructure/detachedres/detachedreslibrary/DetachedREsTest.java
+++ b/src/test/java/org/gcube/infrastructure/detachedres/detachedreslibrary/DetachedREsTest.java
@ -54,7 +54,7 @@ public class DetachedREsTest extends TestCase {
 				SecurityTokenProvider.instance.set(Constants.DEFAULT_TOKEN);
 				DetachedREsClient detachedREsClient = new DetachedREsClient();
 				DetachedREs detachedREs = detachedREsClient.getDetachedREs();
-
+				
 				int totalVREDimissed = 0;
 				for (Gateway gateway : detachedREs.getGateways().values()) {
 					logger.debug("\n\n");
@ -63,19 +63,19 @@ public class DetachedREsTest extends TestCase {
 					for (VO vo : gateway.getVos().values()) {
 						logger.debug("VO: " + vo.getName());
 						for (VRE vre : vo.getVres().values()) {
-							logger.debug("VRE name: " + vre.getName() + " scope: " + vre.getScope()
-									+ " VRE catalogue url: " + vre.getCatalogUrl() + " VRE catalog Portlet URL: "
-									+ vre.getCatalogPortletURL());
+							logger.debug("VRE name: " + vre.getName() + 
+									" scope: "+vre.getScope() + 
+									" VRE catalogue url: " + vre.getCatalogUrl() + 
+									" VRE catalog Portlet URL: "+vre.getCatalogPortletURL());
 							vreDismissedPerGatew++;
 						}
 					}
-					logger.debug("\n\t\t\t******** VREs dismissed per " + gateway.getName() + " are: "
-							+ vreDismissedPerGatew);
-					totalVREDimissed += vreDismissedPerGatew;
+					logger.debug("\n\t\t\t******** VREs dismissed per " +  gateway.getName() + " are: "+vreDismissedPerGatew);
+					totalVREDimissed+=vreDismissedPerGatew;
 				}
-
+				
 				logger.debug("\n\nTotal VREs dismissed: " + totalVREDimissed);
-
+				
 				assertTrue(true);

 			} catch (Exception e) {
@ -88,7 +88,7 @@ public class DetachedREsTest extends TestCase {
 			assertTrue(true);
 		}
 	}
-
+	
 	@Test
 	public void testFindDetachedVREForVREName() {
 		if (Constants.TEST_ENABLE) {
@ -100,7 +100,7 @@ public class DetachedREsTest extends TestCase {
 				SecurityTokenProvider.instance.set(Constants.DEFAULT_TOKEN);
 				DetachedREsClient detachedREsClient = new DetachedREsClient();
 				VRE vre = detachedREsClient.findDetachedVREforVREName(vreName);
-				logger.debug("The detached VRE for name: " + vreName + " found as: " + vre);
+				logger.debug("The detached VRE for name: " + vreName + " found as: "+vre);
 				assertTrue(true);

 			} catch (Exception e) {
@ -239,13 +239,6 @@ public class DetachedREsTest extends TestCase {

 				createEOSCSecretariatDetachedGateway(eoscSecretariatDetachedGateway);

-				// ------ DESCRAMBLE Gateway begin
-				GatewayJAXB descrambleGateway = new GatewayJAXB();
-				descrambleGateway.setScope("-6");
-				descrambleGateway.setName("DESCRAMBLE Gateway");
-
-				createDescrambleGateway(descrambleGateway);
-
 				// Gateway Add
 				// -------------------

@ -255,7 +248,6 @@ public class DetachedREsTest extends TestCase {
 				gateways.put("-3", parthenosDetachedGateway);
 				gateways.put("-4", aginfraPlusDetachedGateway);
 				gateways.put("-5", eoscSecretariatDetachedGateway);
-				gateways.put("-6", descrambleGateway);

 				DetachedREsJAXB detachedREs = new DetachedREsJAXB();
 				detachedREs.setEnabled(true);
@ -277,17 +269,16 @@ public class DetachedREsTest extends TestCase {

 				logger.info("Check Unmarshalling");
 				Path path = Files.createTempFile("DetachedREsData", ".xml");
-				logger.info("Create file: " + path.toAbsolutePath());
 				File file = path.toFile();
 				jaxbMarshaller.marshal(detachedREs, file);

 				Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
 				DetachedREsJAXB configUnmarshalled = (DetachedREsJAXB) jaxbUnmarshaller.unmarshal(file);
 				logger.debug("DetachedREs unmarshallded: " + configUnmarshalled);
-				// file.delete();
+				file.delete();
 				logger.info("Success!");
 				assertTrue(true);
-
+				
 			} catch (Throwable e) {
 				logger.error(e.getLocalizedMessage(), e);
 				assertTrue("Error in DetachedREs Marshal!", false);
@ -444,14 +435,13 @@ public class DetachedREsTest extends TestCase {
 			gCubeAppsVREJAXB.setName(new String(vre).replace("_", " "));
 			gCubeAppsVREJAXB.setStartDate(new GregorianCalendar(2018, GregorianCalendar.JANUARY, 1).getTime());
 			gCubeAppsVREJAXB.setEndDate(new GregorianCalendar(2020, GregorianCalendar.MARCH, 3).getTime());
-
+			
 			// UPDATED BY FRANCESCO
 			if (vre.compareToIgnoreCase("BlueBridgeProject") == 0 || vre.compareToIgnoreCase("SIASPA") == 0) {
 				gCubeAppsVREJAXB.setCatalogUrl("https://ckan-imarine.d4science.org");
-				gCubeAppsVREJAXB
-						.setCatalogPortletURL("https://i-marine.d4science.org/group/imarine-gateway/data-catalogue");
+				gCubeAppsVREJAXB.setCatalogPortletURL("https://i-marine.d4science.org/group/imarine-gateway/data-catalogue");
 			} else {
-				// not usable
+				//not usable
 				gCubeAppsVREJAXB.setCatalogUrl("http://data.d4science.org/ctlg/" + vre);
 			}

@ -536,8 +526,7 @@ public class DetachedREsTest extends TestCase {

 		LinkedHashMap<String, VREJAXB> gCubeAppsVREsOfD4ScienceOrgDetachedGateway = new LinkedHashMap<>();

-		String[] gCubeAppsVREsOfD4ScienceOrgDetachedGatewayArray = { "CNR_OpenScienceTF", "EcologicalModelling",
-				"EGIEngage", "EGIP", "ICOS_ETC", "IGDI", "rScience", "TCom" };
+		String[] gCubeAppsVREsOfD4ScienceOrgDetachedGatewayArray = { "CNR_OpenScienceTF", "EGIEngage", "ICOS_ETC" };

 		for (String vre : gCubeAppsVREsOfD4ScienceOrgDetachedGatewayArray) {
 			VREJAXB gCubeAppsVREJAXB = new VREJAXB();
@ -586,8 +575,8 @@ public class DetachedREsTest extends TestCase {

 		LinkedHashMap<String, VREJAXB> d4ResearchVREsOfD4ScienceOrgDetachedGateway = new LinkedHashMap<>();

-		String[] d4ResearchVREsOfD4ScienceOrgDetachedGatewayArray = { "EISCAT", "ENVRI", "EOSC_Services", "FAIR_DM",
-				"FisheriesAndEcosystemAtMii", "ICOSEddyCovarianceProcessing", "ISTIOpenAccess", "QCAPI" };
+		String[] d4ResearchVREsOfD4ScienceOrgDetachedGatewayArray = { "EOSC_Services", "FAIR_DM",
+				"FisheriesAndEcosystemAtMii", "ISTIOpenAccess" };

 		for (String vre : d4ResearchVREsOfD4ScienceOrgDetachedGatewayArray) {
 			VREJAXB d4ResearchVREJAXB = new VREJAXB();
@ -604,33 +593,7 @@ public class DetachedREsTest extends TestCase {
 		}
 		d4ResearchOfD4ScienceOrgDetachedGateway.setVres(d4ResearchVREsOfD4ScienceOrgDetachedGateway);

-		// D4OS
-		VOJAXB d4osOfD4ScienceOrgDetachedGateway = new VOJAXB();
-		d4osOfD4ScienceOrgDetachedGateway
-				.setScope("/d4science.research-infrastructures.eu/" + VOProduction.D4OS.getId());
-		d4osOfD4ScienceOrgDetachedGateway.setName(VOProduction.D4OS.getId());
-
-		LinkedHashMap<String, VREJAXB> d4osVREsOfD4ScienceOrgDetachedGateway = new LinkedHashMap<>();
-
-		String[] d4osVREsOfD4ScienceOrgDetachedGatewayArray = { "CNROutreach", "RicAt" };
-
-		for (String vre : d4osVREsOfD4ScienceOrgDetachedGatewayArray) {
-			VREJAXB d4osVREJAXB = new VREJAXB();
-			d4osVREJAXB.setScope("/d4science.research-infrastructures.eu/" + VOProduction.D4OS.getId() + "/" + vre);
-			d4osVREJAXB.setName(new String(vre).replace("_", " "));
-			d4osVREJAXB.setStartDate(new GregorianCalendar(2018, GregorianCalendar.JANUARY, 1).getTime());
-			d4osVREJAXB.setEndDate(new GregorianCalendar(2020, GregorianCalendar.MARCH, 3).getTime());
-			d4osVREJAXB.setCatalogUrl("http://data.d4science.org/ctlg/" + vre);
-			d4osVREJAXB.setManagers(new ArrayList<String>(Arrays.asList("Leonardo Candela", "Pasquale Pagano")));
-			d4osVREsOfD4ScienceOrgDetachedGateway.put(
-					"/d4science.research-infrastructures.eu/" + VOProduction.D4OS.getId() + "/" + vre, d4osVREJAXB);
-		}
-		d4osOfD4ScienceOrgDetachedGateway.setVres(d4osVREsOfD4ScienceOrgDetachedGateway);
-
-		//
 		LinkedHashMap<String, VOJAXB> vosOfD4ScienceOrgDetachedGateway = new LinkedHashMap<>();
-		vosOfD4ScienceOrgDetachedGateway.put("/d4science.research-infrastructures.eu/" + VOProduction.D4OS.getId(),
-				d4osOfD4ScienceOrgDetachedGateway);
 		vosOfD4ScienceOrgDetachedGateway.put(
 				"/d4science.research-infrastructures.eu/" + VOProduction.D4RESEARCH.getId(),
 				d4ResearchOfD4ScienceOrgDetachedGateway);
@ -642,37 +605,4 @@ public class DetachedREsTest extends TestCase {
 		d4ScienceOrgDetachedGateway.setVos(vosOfD4ScienceOrgDetachedGateway);
 	}

-	private void createDescrambleGateway(GatewayJAXB descrambleGateway) {
-		// gCubeApps
-		VOJAXB gCubeAppsOfDescrambleGateway = new VOJAXB();
-		gCubeAppsOfDescrambleGateway
-				.setScope("/d4science.research-infrastructures.eu/" + VOProduction.GCUBEAPPS.getId());
-		gCubeAppsOfDescrambleGateway.setName(VOProduction.GCUBEAPPS.getId());
-
-		LinkedHashMap<String, VREJAXB> gCubeAppsVREsOfDescrambleGateway = new LinkedHashMap<>();
-
-		String[] gCubeAppsVREsOfDescrambleGatewayArray = { "DESCRAMBLE" };
-
-		for (String vre : gCubeAppsVREsOfDescrambleGatewayArray) {
-			VREJAXB gCubeAppsVREJAXB = new VREJAXB();
-			gCubeAppsVREJAXB
-					.setScope("/d4science.research-infrastructures.eu/" + VOProduction.GCUBEAPPS.getId() + "/" + vre);
-			gCubeAppsVREJAXB.setName(new String(vre).replace("_", " "));
-			gCubeAppsVREJAXB.setStartDate(new GregorianCalendar(2014, GregorianCalendar.JANUARY, 1).getTime());
-			gCubeAppsVREJAXB.setEndDate(new GregorianCalendar(2020, GregorianCalendar.SEPTEMBER, 25).getTime());
-			gCubeAppsVREJAXB.setCatalogUrl("http://data.d4science.org/ctlg/" + vre);
-			gCubeAppsVREJAXB.setManagers(new ArrayList<String>(Arrays.asList("Leonardo Candela", "Pasquale Pagano")));
-			gCubeAppsVREsOfDescrambleGateway.put(
-					"/d4science.research-infrastructures.eu/" + VOProduction.GCUBEAPPS.getId() + "/" + vre,
-					gCubeAppsVREJAXB);
-		}
-		gCubeAppsOfDescrambleGateway.setVres(gCubeAppsVREsOfDescrambleGateway);
-
-		LinkedHashMap<String, VOJAXB> vosOfDescrambleGateway = new LinkedHashMap<>();
-		vosOfDescrambleGateway.put("/d4science.research-infrastructures.eu/" + VOProduction.GCUBEAPPS.getId(),
-				gCubeAppsOfDescrambleGateway);
-
-		descrambleGateway.setVos(vosOfDescrambleGateway);
-	}
-
 }
Author	SHA1	Message	Date
Francesco Mangiacrapa	f3baf70dbe	updated date	2020-06-15 14:29:10 +02:00
Francesco Mangiacrapa	82e33fe099	Added property catalogPortletURL and method findDetachedVREforVREName	2020-06-08 15:18:03 +02:00