From 36160ef08b76649287cd5c604e4373093ef35a79 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Tue, 24 Nov 2015 15:49:59 +0000
Subject: [PATCH] Added support for new AuthZ framework, Feature #1496

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/resource-management@120387 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                    |  1 -
 .settings/org.eclipse.wst.common.component    |  3 ---
 distro/changelog.xml                          |  4 +++
 pom.xml                                       |  5 ----
 .../client/ResourceManagementPortlet.java     | 25 -------------------
 .../ResourceManagementPortlet.gwt.xml         |  3 +--
 src/main/webapp/WEB-INF/web.xml               | 15 +++++++++--
 7 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/.classpath b/.classpath
index 8811970..d0457c0 100644
--- a/.classpath
+++ b/.classpath
@@ -35,6 +35,5 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/rmp-common-library"/>
 	<classpathentry kind="output" path="target/resource-management-5.6.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 9a45fb9..a0ff6f3 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -3,9 +3,6 @@
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <dependent-module archiveName="rmp-common-library-2.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rmp-common-library/rmp-common-library">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="resource-management"/>
   </wb-module>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index f797de3..b344fbb 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,5 +1,9 @@
 <ReleaseNotes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="xsd/changelog.xsd">
+	<Changeset component="org.gcube.portlets-admin.resource-management-portlet.5-7-0"
+		date="2015-11-24">
+		<Change>Added support for new AuthZ framework, Feature #1496</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-admin.resource-management-portlet.5-6-0"
 		date="2015-09-28">
 		<Change>Refactored code in dependencies to promote reuse of sweeper features</Change>
diff --git a/pom.xml b/pom.xml
index 648ff09..95a79d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,11 +171,6 @@
 			<artifactId>software-upload-wizard</artifactId>
 			<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
-		<dependency>
-			<groupId>org.gcube.portlets.admin</groupId>
-			<artifactId>activation-record-widgets</artifactId>
-			<version>[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-		</dependency>
 		<!-- guice guava -->
 		<dependency>
 			<groupId>com.google.guava</groupId>
diff --git a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/ResourceManagementPortlet.java b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/ResourceManagementPortlet.java
index ef60e3c..affffd2 100644
--- a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/ResourceManagementPortlet.java
+++ b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/ResourceManagementPortlet.java
@@ -17,7 +17,6 @@
 package org.gcube.portlets.admin.resourcemanagement.client;
 
 
-import org.gcube.portlets.admin.client.forms.GenericResourceTreeManagerForm;
 import org.gcube.portlets.admin.ishealthmonitor.client.dialog.ISMonitor;
 import org.gcube.portlets.admin.resourcemanagement.client.forms.genericresources.DeployVirtualCollection;
 import org.gcube.portlets.admin.resourcemanagement.client.remote.ProxyRegistry;
@@ -509,30 +508,6 @@ public class ResourceManagementPortlet implements EntryPoint {
 		createSE.setIconStyle("runtimeresource-icon");
 		createMnu.add(createSE);
 
-		// Create activation record from plugins
-		MenuItem createARTM = new MenuItem("Activation Record for Tree Manager") {
-			protected void onClick(final ComponentEvent be) {
-				super.onClick(be);
-				if (SupportedOperations.GENERIC_RESOURCE_CREATE.isAllowed(StatusHandler.getStatus().getCredentials())) {
-					GWT.runAsync(GenericResourceTreeManagerForm.class, new RunAsyncCallback() {
-						@Override
-						public void onSuccess() {
-							String currentScope = StatusHandler.getStatus().getCurrentScope();
-							new GenericResourceTreeManagerForm(currentScope).show();
-						}
-
-						public void onFailure(Throwable reason) {
-							Window.alert("There are networks problem, please check your connection.");              
-						}
-					});					
-				} else {
-					MessageBox.alert("Activation Record for TM", "You are not allowed to execute this operation", null);
-				}
-			};
-		};
-		createARTM.setIconStyle("pluginTM-icon");
-		createMnu.add(createARTM);
-
 		// Create Generic Resource
 		MenuItem deployVirtualCollection = new MenuItem("Instantiate Virtual Collections") {
 			protected void onClick(final ComponentEvent be) {
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 c024170..726d012 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
@@ -4,7 +4,7 @@
 	<inherits name='com.google.gwt.user.User' />
 
 	<!-- To Comment out -->
-	<!-- <set-property name="user.agent" value="safari,gecko1_8,ie9" /> -->
+	<set-property name="user.agent" value="safari,gecko1_8" />
 
 	<!-- Other module inherits -->
 	<inherits name='com.extjs.gxt.ui.GXT' />
@@ -15,7 +15,6 @@
 	<!-- inherits Resource Sweeper Widget -->
 	<inherits name='org.gcube.portlets.admin.resourcesweeper.Resource_sweeper' />
 
-	<inherits name='org.gcube.portlets.admin.Activation_record_widgets' />
 	<!-- inherits IS Health Monitor Widget -->
 	<inherits
 		name='org.gcube.portlets.admin.ishealthmonitor.Resource_ishealth_monitor' />
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 8eb050a..1f17b3d 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -40,6 +40,17 @@
 		<listener-class>org.gcube.portlets.admin.software_upload_wizard.server.BootstrapListener</listener-class>
 	</listener>
 
+	<!-- AuthZ -->
+	<filter>
+		<filter-name>AuthFilter</filter-name>
+		<filter-class>org.gcube.resourcemanagement.support.shared.util.TokenFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>AuthFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+
 	<!-- IS Health -->
 	<servlet>
 		<servlet-name>isHealthServlet</servlet-name>
@@ -61,8 +72,8 @@
 		<servlet-name>arServlet</servlet-name>
 		<url-pattern>/resourcemanagementportlet/activeservice</url-pattern>
 	</servlet-mapping>
-	
-	
+
+
 	<servlet>
 		<servlet-name>jUnitHostImpl</servlet-name>
 		<servlet-class>com.google.gwt.junit.server.JUnitHostImpl</servlet-class>