diff --git a/pom.xml b/pom.xml
index d803826..8f667e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,11 @@
2.2.5
provided
+
+ org.gcube.portlets.admin
+ rmp-common-library
+ [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
+
org.gcube.applicationsupportlayer
aslcore
@@ -127,17 +132,13 @@
[1.5.0-SNAPSHOT, 2.0.0-SNAPSHOT)
provided
+
+
org.gcube.portlets.admin
- rmp-common-library
- [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
+ ishealth-monitor-widget
+ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
-
-
-
-
-
-
@@ -266,8 +267,7 @@
- -Xmx512M -DGLOBUS_LOCATION=${GLOBUS_LOCATION}
- -classpath $CLASSPATH:${GLOBUS_LOCATION}
+ -Xmx512M -DGLOBUS_LOCATION=${GLOBUS_LOCATION}
ResourceManagementPortlet.html
${webappDirectory}
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 92250e2..57c6b1c 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
@@ -20,7 +20,7 @@ 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.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.remote.ProxyRegistry;
import org.gcube.portlets.admin.resourcemanagement.client.utils.Commands;
@@ -439,16 +439,16 @@ public class ResourceManagementPortlet implements EntryPoint {
MenuItem testIS = new MenuItem("Check IS Health") {
protected void onClick(final ComponentEvent be) {
-// super.onClick(be);
-// GWT.runAsync(ISMonitor.class, new RunAsyncCallback() {
-// @Override
-// public void onSuccess() {
-// ISMonitor.pingIS();
-// }
-// public void onFailure(Throwable reason) {
-// Window.alert("There are networks problem, please check your connection.");
-// }
-// });
+ super.onClick(be);
+ GWT.runAsync(ISMonitor.class, new RunAsyncCallback() {
+ @Override
+ public void onSuccess() {
+ ISMonitor.pingIS();
+ }
+ public void onFailure(Throwable reason) {
+ Window.alert("There are networks problem, please check your connection.");
+ }
+ });
};
};
testIS.setIconStyle("is-icon");
diff --git a/src/main/resources/clientlog4j.properties b/src/main/resources/clientlog4j.properties
new file mode 100644
index 0000000..b98f952
--- /dev/null
+++ b/src/main/resources/clientlog4j.properties
@@ -0,0 +1,9 @@
+log4j.rootLogger=DEBUG, A1
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+
+# Print the date in ISO 8601 format
+log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
+
+# Print only messages of level TRACE or above in the package org.gcube
+log4j.logger.org.gcube=TRACE
\ No newline at end of file
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 5bff73d..a3bf36a 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
@@ -14,7 +14,7 @@
-
+
-->
-
-
-
-
+
+ isHealthServlet
+ org.gcube.portlets.admin.ishealthmonitor.server.ISMonitorServiceImpl
+
-
-
-
-
+
+ isHealthServlet
+ /resourcemanagementportlet/ishealth
+