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

fix for wsresource by subtype query, integrated Activation Record Widgets 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/resource-management@81528 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2013-09-16 09:45:21 +00:00
parent 88a96961c1
commit 2526a00d0b
8 changed files with 37 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,9 @@
<dependent-module archiveName="rmp-common-library-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rmp-common-library/rmp-common-library"> <dependent-module archiveName="rmp-common-library-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rmp-common-library/rmp-common-library">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="activation-record-widgets-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/activation-record-widgets/activation-record-widgets">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/> <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
<property name="context-root" value="resource-management"/> <property name="context-root" value="resource-management"/>
</wb-module> </wb-module>

10
pom.xml
View File

@ -149,11 +149,11 @@
<!-- <artifactId>software-upload-wizard</artifactId> --> <!-- <artifactId>software-upload-wizard</artifactId> -->
<!-- <version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> --> <!-- <version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
<!-- </dependency> --> <!-- </dependency> -->
<!-- <dependency> --> <dependency>
<!-- <groupId>org.gcube.portlets.admin</groupId> --> <groupId>org.gcube.portlets.admin</groupId>
<!-- <artifactId>activation-record-widgets</artifactId> --> <artifactId>activation-record-widgets</artifactId>
<!-- <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> --> <version>[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<!-- </dependency> --> </dependency>
<!-- guice --> <!-- guice -->
<dependency> <dependency>
<groupId>com.google.inject</groupId> <groupId>com.google.inject</groupId>

89
src/main/java/org/gcube/portlets/admin/resourcemanagement/client/ResourceManagementPortlet.java
View File

@ -17,9 +17,9 @@
package org.gcube.portlets.admin.resourcemanagement.client; package org.gcube.portlets.admin.resourcemanagement.client;
//import org.gcube.portlets.admin.client.forms.ActivationRecordVMForm; import org.gcube.portlets.admin.client.forms.ActivationRecordVMForm;
//import org.gcube.portlets.admin.client.forms.GenericResourceCMForm; import org.gcube.portlets.admin.client.forms.GenericResourceCMForm;
//import org.gcube.portlets.admin.client.forms.GenericResourceTreeManagerForm; import org.gcube.portlets.admin.client.forms.GenericResourceTreeManagerForm;
import org.gcube.portlets.admin.ishealthmonitor.client.dialog.ISMonitor; 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.forms.genericresources.DeployVirtualCollection;
import org.gcube.portlets.admin.resourcemanagement.client.remote.ProxyRegistry; import org.gcube.portlets.admin.resourcemanagement.client.remote.ProxyRegistry;
@ -499,78 +499,27 @@ public class ResourceManagementPortlet implements EntryPoint {
// Create activation record from plugins // Create activation record from plugins
MenuItem createARTM = new MenuItem("Activation Record for Tree Manager") { MenuItem createARTM = new MenuItem("Activation Record for Tree Manager") {
protected void onClick(final ComponentEvent be) { protected void onClick(final ComponentEvent be) {
// super.onClick(be); super.onClick(be);
// if (SupportedOperations.GENERIC_RESOURCE_CREATE.isAllowed(StatusHandler.getStatus().getCredentials())) { if (SupportedOperations.GENERIC_RESOURCE_CREATE.isAllowed(StatusHandler.getStatus().getCredentials())) {
// GWT.runAsync(GenericResourceTreeManagerForm.class, new RunAsyncCallback() { GWT.runAsync(GenericResourceTreeManagerForm.class, new RunAsyncCallback() {
// @Override @Override
// public void onSuccess() { public void onSuccess() {
// String currentScope = StatusHandler.getStatus().getCurrentScope(); String currentScope = StatusHandler.getStatus().getCurrentScope();
// new GenericResourceTreeManagerForm(currentScope).show(); new GenericResourceTreeManagerForm(currentScope).show();
// } }
//
// public void onFailure(Throwable reason) { public void onFailure(Throwable reason) {
// Window.alert("There are networks problem, please check your connection."); Window.alert("There are networks problem, please check your connection.");
// } }
// }); });
// } else { } else {
// MessageBox.alert("Activation Record for TM", "You are not allowed to execute this operation", null); MessageBox.alert("Activation Record for TM", "You are not allowed to execute this operation", null);
// } }
}; };
}; };
createARTM.setIconStyle("pluginTM-icon"); createARTM.setIconStyle("pluginTM-icon");
createMnu.add(createARTM); createMnu.add(createARTM);
// Create activation record from plugins
MenuItem createACM = new MenuItem("Activation Record for Content Manager") {
protected void onClick(final ComponentEvent be) {
// super.onClick(be);
// if (SupportedOperations.GENERIC_RESOURCE_CREATE.isAllowed(StatusHandler.getStatus().getCredentials())) {
// GWT.runAsync(GenericResourceCMForm.class, new RunAsyncCallback() {
// @Override
// public void onSuccess() {
// String currentScope = StatusHandler.getStatus().getCurrentScope();
// new GenericResourceCMForm(currentScope).show();
// }
//
// public void onFailure(Throwable reason) {
// Window.alert("There are networks problem, please check your connection.");
// }
// });
//
// } else {
// MessageBox.alert("Activation Record for CM", "You are not allowed to execute this operation", null);
// }
};
};
createACM.setIconStyle("pluginCM-icon");
createMnu.add(createACM);
// Create activation record from VM
MenuItem createVM = new MenuItem("Activation Record for View Manager") {
protected void onClick(final ComponentEvent be) {
// super.onClick(be);
// if (SupportedOperations.GENERIC_RESOURCE_CREATE.isAllowed(StatusHandler.getStatus().getCredentials())) {
// //MessageBox.alert("Activation Record for VM", "Operation not implemented yet.", null);
//
// GWT.runAsync(ActivationRecordVMForm.class, new RunAsyncCallback() {
// @Override
// public void onSuccess() {
// String currentScope = StatusHandler.getStatus().getCurrentScope();
// new ActivationRecordVMForm(currentScope).show();
// }
//
// public void onFailure(Throwable reason) {
// Window.alert("There are networks problem, please check your connection.");
// }
// });
// } else {
// MessageBox.alert("Activation Record for VM", "You are not allowed to execute this operation", null);
// }
};
};
createVM.setIconStyle("pluginVM-icon");
createMnu.add(createVM);
// Create Generic Resource // Create Generic Resource
MenuItem deployVirtualCollection = new MenuItem("Instantiate Virtual Collections") { MenuItem deployVirtualCollection = new MenuItem("Instantiate Virtual Collections") {
protected void onClick(final ComponentEvent be) { protected void onClick(final ComponentEvent be) {

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

@ -12,7 +12,7 @@
<!-- inherits Resource Sweeper Widget --> <!-- inherits Resource Sweeper Widget -->
<!-- <inherits name='org.gcube.portlets.admin.resourcesweeper.Resource_sweeper' /> --> <!-- <inherits name='org.gcube.portlets.admin.resourcesweeper.Resource_sweeper' /> -->
<!-- <inherits name='org.gcube.portlets.admin.Activation_record_widgets' /> --> <inherits name='org.gcube.portlets.admin.Activation_record_widgets' />
<!-- inherits IS Health Monitor Widget --> <!-- inherits IS Health Monitor Widget -->
<inherits name='org.gcube.portlets.admin.ishealthmonitor.Resource_ishealth_monitor' /> <inherits name='org.gcube.portlets.admin.ishealthmonitor.Resource_ishealth_monitor' />

2
src/main/webapp/ResourceManagementPortlet.css
View File

@ -228,7 +228,7 @@
} }
.wsresources-icon { .wsresources-icon {
background-image: url(images/icons/page_white_world.png) !important; background-image: url(images/icons/ws-resource.png) !important;
} }
.ghn-icon { .ghn-icon {

16
src/main/webapp/WEB-INF/web.xml
View File

@ -52,15 +52,15 @@
</servlet-mapping> </servlet-mapping>
<!-- Activation Record Widgets --> <!-- Activation Record Widgets -->
<!-- <servlet> --> <servlet>
<!-- <servlet-name>arServlet</servlet-name> --> <servlet-name>arServlet</servlet-name>
<!-- <servlet-class>org.gcube.portlets.admin.server.ARServiceImpl</servlet-class> --> <servlet-class>org.gcube.portlets.admin.server.ARServiceImpl</servlet-class>
<!-- </servlet> --> </servlet>
<!-- <servlet-mapping> --> <servlet-mapping>
<!-- <servlet-name>arServlet</servlet-name> --> <servlet-name>arServlet</servlet-name>
<!-- <url-pattern>/resourcemanagementportlet/activeservice</url-pattern> --> <url-pattern>/resourcemanagementportlet/activeservice</url-pattern>
<!-- </servlet-mapping> --> </servlet-mapping>
<servlet> <servlet>

BIN
src/main/webapp/images/icons/page_white_world.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 734 B

BIN
src/main/webapp/images/icons/ws-resource.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 695 B