gCubeSystem
/
resource-management-portlet
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implemented Feature #187, remove scope operation with Report 

Implemented Feature #446 Show SmartGearsDistribution version instead of SmartGearsDistributionBundle version for Distro Version

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/resource-management@117658 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2015-08-04 13:21:22 +00:00
parent 268498bcc3
commit 6e2bddd6ec
9 changed files with 131 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.classpath
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/resource-management-5.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/resource-management-5.6.0-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="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.5.0-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/resource-management-5.6.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

2
.settings/org.eclipse.wst.common.component
View File

@ -3,7 +3,7 @@
<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.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rmp-common-library/rmp-common-library">
<dependent-module archiveName="rmp-common-library-2.4.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"/>

72
distro/changelog.xml
View File

@ -1,25 +1,32 @@
<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-5-0" date="2015-06-09">
<Change>Fix for Incident #187, remove scope operation not passing through Resource Manager</Change>
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.5-6-0"
date="2015-08-04">
<Change>Implemented Feature #187, remove scope operation with Report</Change>
<Change>Implemented Feature #446 Show SmartGearsDistribution version instead of SmartGearsDistributionBundle version for Distro Version</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.5-4-0" date="2015-04-21">
<Change>fixed Ticket #1119 Resource Management / Monitor wrong generic resource query</Change>
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.5-5-0"
date="2015-06-09">
<Change>Fix for Incident #187, remove scope operation not passing
through Resource Manager</Change>
</Changeset>
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.5-4-0"
date="2015-04-21">
<Change>fixed Ticket #1119 Resource Management / Monitor wrong generic
resource query</Change>
<Change>Ported to GWT 270</Change>
<Change>Updated for showing SmartGears versions in gHN Grid View</Change>
<Change>Updated for showing SmartGears versions in gHN Grid View
</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.5-3-0" date="2014-12-09">
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.5-3-0"
date="2014-12-09">
<Change>Added Host column in grid view for service endpoints</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.5-2-0" date="2014-06-06">
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.5-2-0"
date="2014-06-06">
<Change>Ported to gCore Free Portal</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.5-1-0"
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.5-1-0"
date="2013-10-21">
<Change>New Look And Feel</Change>
<Change>Ported to GWT 2-5-1</Change>
@ -27,38 +34,32 @@
<Change>Removed GCF Dependency</Change>
<Change>Logging with sl4j Enabled</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.4-1-0"
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.4-1-0"
date="2013-04-19">
<Change>added activation record widget as external module</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.4-0-0"
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.4-0-0"
date="2013-02-27">
<Change>Mavenized</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.3-0-0"
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.3-0-0"
date="2013-01-13">
<Change>Reengineered completely to support modules</Change>
<Change>Added one click feature for retrieving resource profiles
</Change>
<Change>generic Resource grid view show description</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.2-3-0"
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.2-3-0"
date="2012-10-18">
<Change>Added plugin for TreeManager activation record creation
</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.2-2-0"
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.2-2-0"
date="2012-09-21">
<Change>New Software Upload Wizard integrated</Change>
<Change>Added support for resource manger service 2</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.2-0-0"
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.2-0-0"
date="2012-05-04">
<Change>Completely restyled pinned resources panel (former opened
resources panel) using CSS3 and HTML5
@ -72,45 +73,38 @@
and gHN States
</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.1-0-0"
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.1-0-0"
date="2010-10-15">
<Change>First release on gxt and gwt2.0</Change>
<Change>for etics 2.0.1 release</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.1-1-0"
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.1-1-0"
date="2010-10-24">
<Change>for etics 2.1.0 release</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.1-2-0"
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.1-2-0"
date="2010-11-3">
<Change>for etics 2.2.0 release</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.1-3-0"
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.1-3-0"
date="2010-11-24">
<Change>for etics 2.2.1 release</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.1-4-0"
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.1-4-0"
date="2011-01-13">
<Change>for etics 2.2.2 release</Change>
<Change>Added sweeper for invalid resources (expired GHNs and orphan
RIs)
</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.1-7-0"
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.1-7-0"
date="2011-07-01">
<Change>Correctly lists GCUBECollection type from new Content Manager
</Change>
<Change>Correctly lists VIEW type from new Content Manager</Change>
<Change>Ported to GWT 2.2 GXT 2.2.3</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-admin.resource-management-portlet.1-9-0"
<Changeset component="org.gcube.portlets-admin.resource-management-portlet.1-9-0"
date="2011-12-14">
<Change>Added support for runtime resources</Change>
</Changeset>

2
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.portlets.admin</groupId>
<artifactId>resource-management</artifactId>
<version>5.5.0-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>gCube Resource Management Portlet</name>
<description>

53
src/main/java/org/gcube/portlets/admin/resourcemanagement/client/utils/Commands.java
View File

@ -280,6 +280,59 @@ public class Commands {
Commands.unmask(UIIdentifiers.MAIN_CONTAINER_VIEWPORT_ID, UIIdentifiers.RESOURCE_DETAIL_GRID_PANEL);
}
}
public static final void buildRemoveFromScopeReport(final Tuple<String> result) {
if (result.size() < 4) {
MessageBox.alert("Invalid Report Received", "Don't know why :(", null);
Commands.unmask(UIIdentifiers.MAIN_CONTAINER_VIEWPORT_ID, UIIdentifiers.RESOURCE_DETAIL_GRID_PANEL);
return;
}
Dialog dlg = new Dialog();
dlg.setLayout(new FitLayout());
dlg.setHeading("XML Resource Profile");
dlg.setModal(true);
dlg.setWidth(800);
dlg.setHeight(400);
dlg.setHideOnButtonClick(true);
// HtmlContainer htmlContainer = new HtmlContainer();
try {
String reportID = result.get(0);
// String resType = result.get(1);
String xmlReport = result.get(2);
String htmlReport = result.get(3);
//String resourceTitle = ResourceTypeDecorator.AddScopeReport.getLabel() + ": " + reportID;
int repSoFar = TaskbarRegister.getCurrAddScopeReportsNumber() + 1;
String resourceTitle = ResourceTypeDecorator.RemoveScopeReport.getLabel() + "("+repSoFar+")";
// This resource has already been opened
if (TaskbarRegister.contains(reportID)) {
TaskbarRegister.getTaskbarItem(reportID).destroy();
Commands.showPopup("Retrieve Report", "Refreshing Report id: " +
reportID, 3000);
}
MainPanel taskbarContainer = WidgetsRegistry.getPanel(UIIdentifiers.TASKBAR_PANEL);
TaskbarItem tkItem = new TaskbarItem(
StatusHandler.getStatus().getCurrentScope(),
ResourceTypeDecorator.RemoveScopeReport,
taskbarContainer,
reportID,
resourceTitle,
"resource-profile-taskbar-item",
ResourceTypeDecorator.DeployReport.getIcon());
tkItem.getRelatedWindow().setMainWidget(
new ResourceProfilePanel(
ResourceTypeDecorator.RemoveScopeReport,
xmlReport, htmlReport).getWidget());
TaskbarRegister.registerTaskbarWidget(reportID, tkItem);
} catch (Exception e) {
GWT.log("During HTML conversion", e);
} finally {
Commands.unmask(UIIdentifiers.MAIN_CONTAINER_VIEWPORT_ID, UIIdentifiers.RESOURCE_DETAIL_GRID_PANEL);
}
}
public static final void doSetSuperUser(final boolean state) {
if (state) {

22
src/main/java/org/gcube/portlets/admin/resourcemanagement/client/views/resourcedetails/ContextMenuFactory.java
View File

@ -78,7 +78,7 @@ public class ContextMenuFactory {
};
getProfile.setIconStyle("profile-icon");
menu.add(getProfile);
MenuItem getErrors = new MenuItem("Validate") {
@Override
protected void onClick(final ComponentEvent be) {
@ -145,15 +145,21 @@ public class ContextMenuFactory {
new AsyncCallback<Tuple<String>>() {
public void onSuccess(final Tuple<String> result) {
Commands.unmask(UIIdentifiers.MAIN_CONTAINER_VIEWPORT_ID);
if (result.get(0).equals("ACK")) {
MessageBox.info("Remove From Scope",
"The required remove from scope operation has been applied.<br/>", null);
} else {
if (result != null) {
MessageBox.info("Remove from Scope",
"The required remove from scope operation has been applied.<br/>" +
"The generated report ID is:<br/>" +
"<b>" + result.get(0) + "</b>",
null);
Commands.buildRemoveFromScopeReport(result);
}
else {
MessageBox.alert("Remove from Scope",
"The required remove from scope operation has NOT been applied.<br/>" +
result.get(0),
"",
null);
}
}
public void onFailure(final Throwable caught) {
Commands.unmask(UIIdentifiers.MAIN_CONTAINER_VIEWPORT_ID);
@ -685,6 +691,6 @@ public class ContextMenuFactory {
return delete;
}
}

20
src/main/java/org/gcube/portlets/admin/resourcemanagement/server/ServiceProxyImpl.java
View File

@ -205,11 +205,25 @@ public class ServiceProxyImpl extends RemoteServiceServlet implements ServicePro
AllowedResourceTypes type = AllowedResourceTypes.valueOf(resType);
ScopeBean targetScope = new ScopeBean(scope);
ScopeBean sourceScope = new ScopeBean(status.getCurrentScope());
return new Tuple<String>(ManagementUtils.removeFromExistingScope(type,
String reportID = ManagementUtils.removeFromExistingScope(type,
resourceIDs.toArray(new String[]{}),
sourceScope,
targetScope));
targetScope);
RMReportingLibrary manager =
ResourceFactory.createResourceManager(type).getReportResourceManager(targetScope.toString());
String xmlReport = manager.getReport(reportID);
String mappingPath = this.getXML2HTMLMapping();
String htmlReport = ISClientRequester.XML2HTML(xmlReport, mappingPath);
return new Tuple<String>(
reportID,
resType,
xmlReport,
htmlReport);
}
public final String deploy(final List<String> ghnsID, final List<String> servicesID) throws Exception {

16
src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml
View File

@ -4,25 +4,27 @@
<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,ie9" /> -->
<!-- Other module inherits -->
<inherits name='com.extjs.gxt.ui.GXT' />
<inherits name='com.google.gwt.query.Query' />
<inherits name='com.google.gwt.query.Query' />
<!-- inherits Software Uplad Widget -->
<inherits name='org.gcube.portlets.admin.software_upload_wizard.SoftwareUploadWizard' />
<inherits
name='org.gcube.portlets.admin.software_upload_wizard.SoftwareUploadWizard' />
<!-- 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' />
<!-- inherits IS Health Monitor Widget -->
<inherits
name='org.gcube.portlets.admin.ishealthmonitor.Resource_ishealth_monitor' />
<inherits name='org.gcube.resourcemanagement.support.Resource_support' />
<entry-point
class='org.gcube.portlets.admin.resourcemanagement.client.ResourceManagementPortlet' />
<!-- Specify the paths for translatable code -->
<source path='client' />
<source path='shared' />
<add-linker name="xsiframe" />
</module>

78
src/main/webapp/ResourceManagementPortlet.html
View File

@ -17,45 +17,6 @@
<link href='http://fonts.googleapis.com/css?family=Reenie+Beanie' rel='stylesheet' type='text/css'>
<title>D4Science Infrastructure Monitor</title>
<style>
a:hover {
opacity: 0.7;
}
.footer {
margin-top: 10px;
position: relative;
width: 100%;
background-color: #99CC33;
clear: both;
color: #FFFFFF;
height: 20px;
text-align: center;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 1em;
font-size-adjust: none;
font-style: normal;
font-variant: normal;
font-weight: normal;
}
.ec {
font-family: arial, sans-serif;
position: relative;
width: 100%;
background-color: white;
clear: both;
text-align: center;
}
.slogan {
font-family: arial, sans-serif;
color: #666666;
font-size: 12px;
text-align: right;
border-bottom: 1px solid #DDDDDD;
}
</style>
<!-- -->
@ -72,45 +33,8 @@ a:hover {
</head>
<body TOPMARGIN=0 LEFTMARGIN=0>
<table class="slogan" cellspacing="0" cellpadding="0" border="0"
width="100%" height="20px">
<tr>
<td colspan="2" height="5" bgcolor="#3399CC" />
</tr>
<tr>
<td colspan="2" height="5" bgcolor="#000080" />
</tr>
<tr>
<td align="left">&nbsp;&nbsp;<img style="padding-top: 5px;" src="mask_images/D4ScienceInfrastructure.png" />
</td>
<td align="right">&nbsp;&nbsp;<a target="_blank" href="http://www.gcube-system.org"><img style="padding-top: 5px;" src="mask_images/gCube.png" /></a>
</td>
</tr>
</table>
<div style="display: block">
<body>
<div style="margin-top: 5px; margin-left: 5px;" id="MyUniqueDIV"></div>
<div class="footer">
</div>
<div class="ec"><a style="color: #FFFFFF;"
href="http://europa.eu/index_en.htm" target="_blank" linkindex="36"
set="yes"><img hspace="5" align="absmiddle"
src="mask_images/eu.jpg" alt="EU" /></a> <a style="color: #FFFFFF;"
href="http://cordis.europa.eu/fp7/ict/e-infrastructure/home_en.html"
target="_blank" linkindex="37" set="yes"><img hspace="5"
align="absmiddle" src="mask_images/e_infrastructure.gif"
alt="FP7 e-Infrastructures" /></a> <a style="color: #FFFFFF;"
href="http://cordis.europa.eu/fp7/capacities/home_en.html"
target="_blank" linkindex="38" set="yes"><img hspace="5"
align="absmiddle" src="mask_images/7_capacities.gif"
alt="FP7 Capacities programme" /></a></div>
</div>
</body>
</html>