diff --git a/.classpath b/.classpath
index 2c670f3..d3ac06f 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
-
+
@@ -23,11 +23,6 @@
-
-
-
-
-
@@ -36,5 +31,10 @@
-
+
+
+
+
+
+
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index a9422d9..7387db6 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
eclipse.preferences.version=1
jarsExcludedFromWebInfLib=
-lastWarOutDir=/Users/massi/Documents/workspace/resource-management/target/resource-management-5.1.0-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/resource-management/target/resource-management-5.2.0-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 2677fd4..443e085 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,8 @@
-#Wed Feb 27 16:47:37 CET 2013
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index a807789..fc9c798 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,4 @@
-
-
+
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index fefc63a..c24712e 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,6 +2,6 @@
-
+
diff --git a/distro/changelog.xml b/distro/changelog.xml
index ac57c0a..680bd31 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,5 +1,9 @@
+
+ Ported to gCore Free Portal
+
diff --git a/pom.xml b/pom.xml
index 2d66514..8f816c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
org.gcube.portlets.admin
resource-management
- 5.1.0-SNAPSHOT
+ 5.2.0-SNAPSHOT
war
gCube Resource Management Portlet
@@ -29,8 +29,8 @@
3.0
distro
- 1.6
- 1.6
+ 1.7
+ 1.7
${project.build.directory}/${project.build.finalName}
-
org.gcube.portlets.user
gcube-widgets
@@ -83,14 +78,13 @@
com.sencha.gxt
gxt
2.2.5
- provided
com.googlecode.gwtquery
gwtquery
1.3.3
-
+
org.gcube.applicationsupportlayer
aslcore
provided
@@ -108,6 +102,7 @@
org.gcube.dvos
usermanagement-core
+ provided
org.gcube.portlets.admin
@@ -122,20 +117,17 @@
org.gcube.core
- common-fw-clients
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ common-fw-clients
provided
org.gcube.core
- common-clients
- [2.0.2-SNAPSHOT, 3.0.0-SNAPSHOT)
+ common-clients
provided
org.gcube.core
- common-scope-maps
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ common-scope-maps
org.gcube.resourcemanagement
@@ -144,8 +136,7 @@
org.gcube.resources
- registry-publisher
- [1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ registry-publisher
provided
@@ -189,37 +180,29 @@
com.google.inject
guice
${guice.version}
- provided
+ compile
com.google.inject.extensions
guice-servlet
${guice.version}
- provided
-
-
- ch.qos.logback
- logback-classic
- 1.0.13
- provided
+ compile
net.customware.gwt.dispatch
gwt-dispatch
- provided
+ 1.2.0
javax.mail
javax.mail-api
1.4.5
- provided
com.liferay.portal
portal-service
- 6.0.6
provided
@@ -236,17 +219,17 @@
org.apache.commons
commons-compress
- provided
+ compile
commons-fileupload
commons-fileupload
- provided
+ compile
commons-io
commons-io
- provided
+ compile
@@ -267,7 +250,8 @@
com.allen-sauer.gwt.log
gwt-log
- provided
+ 3.1.7
+ compile
@@ -322,8 +306,8 @@
maven-compiler-plugin
2.3.2
-
- 1.6
+
+ 1.7
diff --git a/src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml b/src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml
index ad60f9f..3d0c29a 100644
--- a/src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml
@@ -3,7 +3,9 @@
-
+
+
+
diff --git a/src/main/webapp/WEB-INF/xml/scopedata.xml b/src/main/webapp/WEB-INF/xml/scopedata.xml
index 7dfd3d2..00ff692 100644
--- a/src/main/webapp/WEB-INF/xml/scopedata.xml
+++ b/src/main/webapp/WEB-INF/xml/scopedata.xml
@@ -47,5 +47,21 @@
+
+
+ CNR.it
+
+
+ CNR.it
+ ServiceMap_CNR.it.xml
+ /CNR.it
+
+
+ CNR.it/ISTI
+ ServiceMap_ISTI.xml
+ /CNR.it/ISTI
+
+
+
diff --git a/src/main/webapp/WEB-INF/xml/scopedata_admin.xml b/src/main/webapp/WEB-INF/xml/scopedata_admin.xml
index fe2d6f7..ac6c078 100644
--- a/src/main/webapp/WEB-INF/xml/scopedata_admin.xml
+++ b/src/main/webapp/WEB-INF/xml/scopedata_admin.xml
@@ -22,7 +22,8 @@
d4science/EUBrazilOpenBio
ServiceMap_EUBrazilOpenBio.xml
- /d4science.research-infrastructures.eu/EUBrazilOpenBio
+ /d4science.research-infrastructures.eu/EUBrazilOpenBio
+
@@ -45,6 +46,27 @@
ServiceMap_devNext.xml
/gcube/devNext
+
+ gcube/secureVO
+ ServiceMap_secureVO.xml
+ /gcube/secureVO
+
+
+
+
+
+ CNR.it
+
+
+ CNR.it
+ ServiceMap_CNR.it.xml
+ /CNR.it
+
+
+ CNR.it/ISTI
+ ServiceMap_ISTI.xml
+ /CNR.it/ISTI
+
diff --git a/src/main/webapp/coherence.css b/src/main/webapp/coherence.css
index 9db23d3..8bc8286 100644
--- a/src/main/webapp/coherence.css
+++ b/src/main/webapp/coherence.css
@@ -58,7 +58,7 @@
color: #4c68a6;
font-family: "HelveticaNeue-Light", "Helvetica Neue Light",
"Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
- font-weight: 500;
+ font-weight: normal;
font-size: 12px !important;
}