From d52e489df23a254de2323fcc6eae3af004b761a5 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Fri, 27 Sep 2013 12:31:33 +0000
Subject: [PATCH] integration with Service EP Editor completed

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/resource-management@82083 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                    |  4 +--
 .settings/com.google.gdt.eclipse.core.prefs   |  2 +-
 pom.xml                                       |  4 +--
 .../client/utils/OpCommands.java              | 30 ++++++++++++++-----
 src/main/webapp/ResourceManagementPortlet.css |  2 +-
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/.classpath b/.classpath
index 0762a64..a40fe77 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/resource-management-5.0.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/resource-management-5.0.2-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -36,5 +36,5 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/Applications/eclipse 4.3/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/Applications/eclipse 4.3/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA.jar" sourcepath="/Applications/eclipse 4.3/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/resource-management-5.0.1-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/resource-management-5.0.2-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index 1cc3e8b..3585b9d 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.0.1-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/resource-management/target/resource-management-5.0.2-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/pom.xml b/pom.xml
index ed07be1..871557e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>resource-management</artifactId>
-	<version>5.0.1-SNAPSHOT</version>
+	<version>5.0.2-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>gCube Resource Management Portlet</name>
 	<description>
@@ -89,12 +89,12 @@
 		<dependency>
 			<groupId>org.gcube.resources.discovery</groupId>
 			<artifactId>ic-client</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope-maps</artifactId>
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.resourcemanagement</groupId>
diff --git a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/utils/OpCommands.java b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/utils/OpCommands.java
index 64642c7..55eb2b4 100644
--- a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/utils/OpCommands.java
+++ b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/utils/OpCommands.java
@@ -316,17 +316,31 @@ public class OpCommands {
 		}
 
 		if (location.endsWith("/") || location.endsWith("#")) { //standalone
-			location = com.google.gwt.user.client.Window.Location.getProtocol() +"//"+ com.google.gwt.user.client.Window.Location.getHost() + 
-					"/runtime-resource?pid=126&lifecycle=0&state=maximized&modes=view&doAsId=10136&refererPlid=10139&authzToken=101334249"
-					+ "&curscope="+StatusHandler.getStatus().getCurrentScope()+res2EditParam;		
+			location = location.substring(0, location.length()-2);
 		}
-		else { //portal
-			location += "/../runtime-resource?pid=126&lifecycle=0&state=maximized&modes=view&doAsId=10136&refererPlid=10139&authzToken=101334249"
+	
+		location += "/../runtime-resource?pid=126&lifecycle=0&state=maximized&modes=view&doAsId=10136&refererPlid=10139&authzToken=101334249"
 					+ "&curscope="+StatusHandler.getStatus().getCurrentScope()+res2EditParam;		
-		}
-		Window.open(location, "_blank", "");	
+	
+		//Window.open(location, "_blank", "");	
+		openNewWindow("Service Endpoint Editor", location);
+	}
+
+	/**
+	* Opens a new windows with a specified URL..
+	* 
+	* @param name String with the name of the window.
+	* @param url String with your URL.
+	*/
+	public static void openNewWindow(String name, String url) {
+	    com.google.gwt.user.client.Window.open(url, name.replace(" ", "_"),
+	           "menubar=no," + 
+	           "location=false," + 
+	           "resizable=yes," + 
+	           "scrollbars=yes," + 
+	           "status=no," + 
+	           "dependent=true");
 	}
 
 
-
 }
diff --git a/src/main/webapp/ResourceManagementPortlet.css b/src/main/webapp/ResourceManagementPortlet.css
index d7450dd..1c56496 100644
--- a/src/main/webapp/ResourceManagementPortlet.css
+++ b/src/main/webapp/ResourceManagementPortlet.css
@@ -10,7 +10,7 @@
 }
 
 .iosItem {
-	color: #FDFDF6;
+	color: #444;
 	font-family: "HelveticaNeue-Light", "Helvetica Neue Light",
 		"Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
 	font-weight: 300;