diff --git a/.classpath b/.classpath index 7055862..b17e3fb 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -39,5 +39,5 @@ - + diff --git a/distro/changelog.xml b/distro/changelog.xml index 2fbb550..926a604 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,5 +1,10 @@ + + Added D4OS VO to the config file. + + Feature #12726 diff --git a/pom.xml b/pom.xml index 20ce998..183724a 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.admin resource-management - 6.6.0-SNAPSHOT + 6.6.1-SNAPSHOT war gCube Resource Management Portlet diff --git a/src/main/webapp/WEB-INF/xml/scopedata.xml b/src/main/webapp/WEB-INF/xml/scopedata.xml index d59488f..003d132 100644 --- a/src/main/webapp/WEB-INF/xml/scopedata.xml +++ b/src/main/webapp/WEB-INF/xml/scopedata.xml @@ -9,6 +9,11 @@ ServiceMap_d4science.research-infrastructures.eu.xml /d4science.research-infrastructures.eu + + d4science/D4OS + ServiceMap_D4OS.xml + /d4science.research-infrastructures.eu/D4OS + d4science/D4Research ServiceMap_D4Research.xml diff --git a/src/main/webapp/WEB-INF/xml/scopedata_admin.xml b/src/main/webapp/WEB-INF/xml/scopedata_admin.xml index d59488f..003d132 100644 --- a/src/main/webapp/WEB-INF/xml/scopedata_admin.xml +++ b/src/main/webapp/WEB-INF/xml/scopedata_admin.xml @@ -9,6 +9,11 @@ ServiceMap_d4science.research-infrastructures.eu.xml /d4science.research-infrastructures.eu + + d4science/D4OS + ServiceMap_D4OS.xml + /d4science.research-infrastructures.eu/D4OS + d4science/D4Research ServiceMap_D4Research.xml