From 3be601aa59691532e8fffcc2fde5bf693f3da7a9 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Tue, 24 Sep 2013 13:35:42 +0000
Subject: [PATCH] moved to FWS

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/custom-portal-handler@81902 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.validation.prefs          |  2 ++
 pom.xml                                             | 13 ++++++-------
 .../scopemanager/scopehelper/ScopeHelper.java       |  7 ++-----
 3 files changed, 10 insertions(+), 12 deletions(-)
 create mode 100644 .settings/org.eclipse.wst.validation.prefs

diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..04cad8c
--- /dev/null
+++ b/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/pom.xml b/pom.xml
index 8d3bf60..bc871d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.gcube.portal</groupId>
 	<artifactId>custom-portal-handler</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Custom Portal Handler</name>
 	<description>
@@ -32,15 +32,14 @@
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>org.gcube.core</groupId>
-			<artifactId>gcf</artifactId>
-			<version>[1.4.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-			<scope>provided</scope>
+			<groupId>org.gcube.common.portal</groupId>
+			<artifactId>portal-manager</artifactId>
+			<version>[0.1.0-SNAPSHOT, 1.0.0)</version>
 		</dependency>
-			<dependency>
+		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
 			<artifactId>aslcore</artifactId>
-			<version>[3.2.0-SNAPSHOT, 4.0.0-SNAPSHOT)</version>
+			<version>[4.0.0-SNAPSHOT,5.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/src/main/java/org/gcube/portal/custom/scopemanager/scopehelper/ScopeHelper.java b/src/main/java/org/gcube/portal/custom/scopemanager/scopehelper/ScopeHelper.java
index 575ac28..317bed6 100644
--- a/src/main/java/org/gcube/portal/custom/scopemanager/scopehelper/ScopeHelper.java
+++ b/src/main/java/org/gcube/portal/custom/scopemanager/scopehelper/ScopeHelper.java
@@ -10,7 +10,7 @@ import javax.portlet.RenderRequest;
 
 import org.gcube.application.framework.core.session.SessionManager;
 import org.gcube.application.framework.core.util.GenderType;
-import org.gcube.common.core.contexts.GHNContext;
+import org.gcube.common.portal.PortalContext;
 import org.gcube.portal.custom.communitymanager.OrganizationsUtil;
 
 import com.liferay.portal.kernel.exception.PortalException;
@@ -178,9 +178,6 @@ public class ScopeHelper {
 	 * return the infrastructure name 
 	 */
 	public static String getRootConfigFromGCore() {
-		String toReturn = "";
-		GHNContext ctx = GHNContext.getContext();
-		toReturn = (String) ctx.getProperty(GHNContext.INFRASTRUCTURE_NAME, true);
-		return toReturn;
+		return PortalContext.getConfiguration().getInfrastructureName();
 	}
 }