diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index a807789..209aaa8 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -7,6 +7,9 @@
uses
+
+ uses
+
diff --git a/pom.xml b/pom.xml
index 8f667e5..2d89d4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,11 +149,11 @@
-
-
-
-
-
+
+ org.gcube.portlets.admin
+ activation-record-widgets
+ [1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+
com.google.inject
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 57c6b1c..18da7d0 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,9 +17,9 @@
package org.gcube.portlets.admin.resourcemanagement.client;
-//import org.gcube.portlets.admin.client.forms.ActivationRecordVMForm;
-//import org.gcube.portlets.admin.client.forms.GenericResourceCMForm;
-//import org.gcube.portlets.admin.client.forms.GenericResourceTreeManagerForm;
+import org.gcube.portlets.admin.client.forms.ActivationRecordVMForm;
+import org.gcube.portlets.admin.client.forms.GenericResourceCMForm;
+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;
@@ -499,78 +499,27 @@ public class ResourceManagementPortlet implements EntryPoint {
// 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);
-// }
+ 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 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
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 a3bf36a..c35fc10 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
@@ -12,7 +12,7 @@
-
+
diff --git a/src/main/webapp/ResourceManagementPortlet.css b/src/main/webapp/ResourceManagementPortlet.css
index 274fd36..f5e800b 100644
--- a/src/main/webapp/ResourceManagementPortlet.css
+++ b/src/main/webapp/ResourceManagementPortlet.css
@@ -228,7 +228,7 @@
}
.wsresources-icon {
- background-image: url(images/icons/page_white_world.png) !important;
+ background-image: url(images/icons/ws-resource.png) !important;
}
.ghn-icon {
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index babdf2a..73a65ac 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -52,15 +52,15 @@
-
-
-
-
+
+ arServlet
+ org.gcube.portlets.admin.server.ARServiceImpl
+
-
-
-
-
+
+ arServlet
+ /resourcemanagementportlet/activeservice
+
diff --git a/src/main/webapp/images/icons/page_white_world.png b/src/main/webapp/images/icons/page_white_world.png
deleted file mode 100644
index 6ed2490..0000000
Binary files a/src/main/webapp/images/icons/page_white_world.png and /dev/null differ
diff --git a/src/main/webapp/images/icons/ws-resource.png b/src/main/webapp/images/icons/ws-resource.png
new file mode 100644
index 0000000..e1ac96f
Binary files /dev/null and b/src/main/webapp/images/icons/ws-resource.png differ